6f69f7a8bf
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
...
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com >
- Hendrik Leppkes <h.leppkes@gmail.com >
- wm4 <nfxjfg@googlemail.com >
- Clément Bœsch <clement@stupeflix.com >
- James Almer <jamrial@gmail.com >
- Michael Niedermayer <michael@niedermayer.cc >
- Rostislav Pehlivanov <atomnuker@gmail.com >
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-10 20:59:55 +01:00
28fbdece79
avformat: use ff_standardize_creation_time for formats writing all format string metadata
...
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-03 01:37:18 +01:00
b480f0e37a
avformat/cafenc: Move special casing of PCM codecs into ff_codec_caf_tags
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-09-07 01:21:12 +02:00
1acb5ca02a
Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.
...
Fixes ticket #3645 .
2014-05-30 07:26:18 +02:00
2d56f0d054
Write the actual mp3 frame size when muxing into caf if available.
...
Fixes ticket #3648 .
2014-05-26 20:28:07 +02:00
4c49d0824a
Fix alaw and mulaw muxing in caf.
...
Fixes ticket #3644 .
2014-05-17 11:38:17 +02:00
18e7e21e2f
Enable muxing ac-3 in caf.
...
The files play fine with QuickTime.
2014-04-24 18:02:20 +02:00
fb5518cfb7
Force one stream in caf muxer.
...
Based on eeb975f5
2013-12-13 11:57:39 +01:00
7f1b3c2ca6
Fix muxing QDM2 mono into caf.
2013-06-28 09:04:16 +02:00
c46400ddec
cafenc: do not leak caf->pkt_sizes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-02-22 13:52:43 +00:00
9ef29af2e8
cafenc: do not include riff.h
...
ff_codec_get_tag() was moved to internal.h
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-12-05 20:44:28 +00:00
a5d4e94a97
Support iLBC in caf.
2012-11-19 10:19:50 +01:00
7fe6f6e2b1
caf muxer: write metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-10-26 03:12:45 +00:00
73f9d2e887
cafenc: make .long_name match demuxer
...
While here reindent .codec_tag .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-10-25 23:04:13 +00:00
bb2f13c19f
rename missed CodecID to AVCodecID
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-07 23:57:21 +02:00
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-07 22:45:46 +02:00
a6ef7b3a77
cafenc: replace deprecated av_dbl2int()
2012-01-23 17:18:13 +01:00
ba10207bbe
Use more designated initializers.
...
Also remove some pointless NULL/0 assigments.
C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
2011-12-30 20:00:53 +01:00
05a267305d
Support more codecs when muxing caf.
2011-08-22 09:35:58 +02:00
ef25e70de3
Stream-copying PureVoice into caf works fine.
2011-08-21 14:52:48 +02:00
9b60b076fb
Support muxing MP1, MP2 and MP3 in caf.
2011-08-01 00:58:49 +02:00
c6e0332f30
Explicitely fail for unsupported codecs when muxing caf.
2011-08-01 00:58:49 +02:00
b35477a2f2
Use av_get_bits_per_sample() for mBitsPerChannel in caf.
2011-08-01 00:58:49 +02:00
88084eecdf
Use little endian for caf codec tags.
2011-07-24 23:52:42 +02:00
45ecc7a294
Support adpcm_ima_wav and adpcm_ms in caf.
2011-07-12 17:35:20 +02:00
43e96d0466
Support gsm_ms in caf files.
2011-07-09 17:13:13 +02:00
976a8b2179
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (40 commits)
H.264: template left MB handling
H.264: faster fill_decode_caches
H.264: faster write_back_*
H.264: faster fill_filter_caches
H.264: make filter_mb_fast support the case of unavailable top mb
Do not include log.h in avutil.h
Do not include pixfmt.h in avutil.h
Do not include rational.h in avutil.h
Do not include mathematics.h in avutil.h
Do not include intfloat_readwrite.h in avutil.h
Remove return statements following infinite loops without break
RTSP: Doxygen comment cleanup
doxygen: Escape '\' in Doxygen documentation.
md5: cosmetics
md5: use AV_WL32 to write result
md5: add fate test
md5: include correct headers
md5: fix test program
doxygen: Drop array size declarations from Doxygen parameter names.
doxygen: Fix parameter names to match the function prototypes.
...
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/flvenc.c
libavformat/oggenc.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-07-04 00:45:21 +02:00
6d721f714e
Fix ff_mov_write_chan() so it can be used by other muxers.
2011-05-17 01:47:12 +02:00
2c4ad1a37b
Initial caf muxer.
2011-05-15 03:25:57 +02:00
