Paul B Mahol
467dfd5dfa
PCM signed 24-bit/32-bit little-endian planar decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-17 19:09:43 +00:00
Michael Niedermayer
f96a653184
flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.
...
I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 18:49:08 +01:00
Stefano Sabatini
a0f2d3fff5
lavf/avienc: return proper error codes, and provide some more feedback
2012-11-17 11:15:00 +01:00
Michael Niedermayer
caedd51e56
mxfdec: fix potential integer overflow in mxf_compute_sample_count()
...
Fixes CID743442
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 02:20:50 +01:00
Matthieu Bouron
83cab07a4c
mxfdec: set audio packets pts
...
Also fix playback of ntsc files.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-16 14:12:37 +01:00
Xidorn Quan
8ee6db393c
mov: add more udta meta data recognition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-16 14:12:37 +01:00
Clément Bœsch
2dd0da787c
lavf/mp3enc: make sure the header is valid before writing audio pkt.
...
An invalid header can lead avpriv_mpegaudio_decode_header() to overread
and/or div by zero.
2012-11-16 14:11:08 +01:00
Janne Grunau
c84cce5a99
mxfdec: fix typo in mxf_read_seek()
...
Check the number of index tables before using byte offset based seeking
instead of the index_tables pointer.
Found by Måns Rullgård <mans@mansr.com>.
2012-11-15 17:37:09 +01:00
Carl Eugen Hoyos
850e5c041d
Read QuickTime version 1 audio fields in broken mov files.
...
Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt " that contain QuickTime version 1
audio fields.
Fixes ticket #1881 .
2012-11-15 14:38:19 +01:00
Michael Niedermayer
a9b1536a01
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bgmc: Fix av_malloc checks in ff_bgmc_init()
rtp: set the payload type as stream id
Conflicts:
libavformat/rtpenc_chain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:31:13 +01:00
Michael Niedermayer
4d941eac16
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
...
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:12:25 +01:00
Michael Niedermayer
a3cb7f992f
xwma: check bytes_per_sample, fix division by 0.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 00:56:54 +01:00
Luca Barbato
3b4296f414
avformat: clarify stream id for muxing
2012-11-14 20:38:51 +01:00
Luca Barbato
8034130e06
rtp: set the payload type as stream id
...
Support multiple video/audio streams with different format in the
same session.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-11-14 20:38:51 +01:00
Paul B Mahol
dbc44667ce
Add missing dependency for avr demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-14 18:02:28 +00:00
Michael Niedermayer
87d073eacc
mov: Dont try to calculate with unknown durations, fix division by 0
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 14:08:44 +01:00
Michael Niedermayer
e13d5e9a4b
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
...
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
Xi Wang
e8769b37fe
segment: fix NULL pointer dereference in seg_write_header()
...
Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference. This patch changes it to seg->oformat->name.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-14 12:33:27 +02:00
Michael Niedermayer
1f1960519a
lxfdec: fix "no audio stream" check. avoid null ptrs deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 00:03:42 +01:00
Michael Niedermayer
af9ec3dd1d
av_probe_input_format3: support NULL as buffer. Fixes null ptr deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 22:21:10 +01:00
Michael Niedermayer
eab022d863
mpegts: prevent freeing ones own section in pat_cb
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 21:45:53 +01:00
Michael Niedermayer
4392e69ad4
mov: check stps correctly, avoid overreading 1 element.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 21:45:53 +01:00
Michael Niedermayer
3669915e93
dvdec: check ipcm more completely, avoid assert failure.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 21:45:53 +01:00
Clément Bœsch
41ebbb3b04
lavf/wtvenc: fix s[tp]_pairs memleak.
2012-11-13 20:02:43 +01:00
Michael Niedermayer
4facddd568
mpegts: dont set stream info when a decoder has already been opened.
...
Fixes assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 15:44:13 +01:00
Michael Niedermayer
327cd0d09b
mpegts: prevent freeing ones own section in pmt_cb
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 15:44:13 +01:00
Paul B Mahol
09a0392341
paf: set channel layout
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-13 13:25:19 +00:00
Michael Niedermayer
799d749c77
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (24 commits)
yop: set channel layout
wtv: set channel layout for mpeg audio
westwood_aud: set channel layout
wc3movie: set channel layout
tmv: set channel layout
tiertexseq: set channel layout
swfdec: set channel layout
sol: set channel layout
smacker: set channel layout
siff: set channel layout
sierravmd: set channel layout
rtpdec_amr: set channel layout
rsodec: set channel layout
rmdec: set channel layout for RA version 3
qcp: set channel layout
psxstr: set channel layout
omadec: set channel layout
oggparsespeex: validate channel count and set channel layout
nuv: set channel layout
mxg: set channel layout
...
Conflicts:
libavformat/swfdec.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 11:09:38 +01:00
Michael Niedermayer
7eb40d85f2
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
...
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
jvdec: set channel layout
iss: set channel layout
ipmovie: set channel layout
iff: set channel layout
idroqdec: set channel layout
gxfdec: set channel layout when applicable
gsmdec: set channel layout
flvdec: set channel layout
dv: set channel layout
dsicin: set channel layout
daud: set channel layout
cdxl: set channel layout
bmv: set channel layout
bink: set channel layout
bfi: set channel layout
bethsoftvid: set channel layout
apc: set channel layout
amr: set channel_layout
ppc: replace pointer casting with AV_COPY32
ppc: fix some unused variable warnings
...
Conflicts:
libavformat/amr.c
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 10:55:07 +01:00
Luca Barbato
22a0827dff
hlsenc: stand alone hls segmenter
...
Simplifies usage but has higher latency.
2012-11-13 01:37:05 +01:00
Michael Niedermayer
abe68364a3
swfdec: check space before copy
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 19:29:27 +01:00
Paul B Mahol
87c113f4b3
wv: use right function to read block_samples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12 15:50:04 +00:00
Justin Ruggles
b9629acb6b
yop: set channel layout
2012-11-12 10:33:23 -05:00
Justin Ruggles
935fbb66ef
wtv: set channel layout for mpeg audio
2012-11-12 10:33:23 -05:00
Justin Ruggles
7b48d93e8a
westwood_aud: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
2ce7f820d4
wc3movie: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
a94b0267f2
tmv: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
7f348bd764
tiertexseq: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
a3949fe11f
swfdec: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
1c7587728c
sol: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
bfccd76adb
smacker: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
57e590e4b8
siff: set channel layout
2012-11-12 10:33:22 -05:00
Justin Ruggles
a634896cf8
sierravmd: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
c1ac602d53
rtpdec_amr: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
ce842029ce
rsodec: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
60a585304c
rmdec: set channel layout for RA version 3
2012-11-12 10:33:21 -05:00
Justin Ruggles
444b79c18a
qcp: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
b5e3e77711
psxstr: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
c9759eb426
omadec: set channel layout
2012-11-12 10:33:21 -05:00
Justin Ruggles
ef1b23ad21
jvdec: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
d4088efbe2
oggparsespeex: validate channel count and set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
4371131283
iss: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
232e9c4c4b
nuv: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
cc57228e31
mxg: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
66d7ceb4aa
mvi: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
f6c6e5aac1
mpc7: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
f24b0b1b6c
mmf: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
87199d34db
mm: set channel layout
2012-11-12 10:33:20 -05:00
Justin Ruggles
41a2d9590d
ipmovie: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
024e03701c
iff: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
73e2007f3d
idroqdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
f6c3adde41
gxfdec: set channel layout when applicable
2012-11-12 10:33:19 -05:00
Justin Ruggles
d4a105ae5c
gsmdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
644d8d2e5a
flvdec: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
d5ca70b103
dv: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
49e7af06f2
dsicin: set channel layout
2012-11-12 10:33:19 -05:00
Justin Ruggles
a05a63785c
daud: set channel layout
...
Update FATE reference due to WAVE channel mask now being set correctly.
2012-11-12 10:33:18 -05:00
Justin Ruggles
0d09a5848f
cdxl: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
e8088d6e4b
bmv: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
2fe804f316
bink: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
ff50d27a63
bfi: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
b5d1a15d1b
bethsoftvid: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
39f0e9b8c6
apc: set channel layout
2012-11-12 10:33:18 -05:00
Justin Ruggles
5595368bcc
amr: set channel_layout
2012-11-12 10:33:18 -05:00
Michael Niedermayer
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
Clément Bœsch
3704804c8f
lavf/assenc: add non strict ts flag.
...
ASS can have several events at the same time.
2012-11-11 22:58:56 +01:00
Michael Niedermayer
5aedee4fac
gxf: avoid null ptr deref without streams.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 20:58:04 +01:00
Justin Ruggles
a903f8f087
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
...
Also reorder some other #include when applicable.
2012-11-11 13:35:12 -05:00
Michael Niedermayer
192db16b9c
segafilm: fix division by 0
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 18:32:46 +01:00
Michael Niedermayer
f1d6f013b2
omadec: fix len check in nprobe() prevent out of array access
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 18:16:48 +01:00
Peter Ross
6f78ba8b0b
electronic arts: support rare samples containing adpcm_ea_r1 audio
...
Fixes ticket #1549 .
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 12:52:02 +01:00
Peter Ross
d168fcb68f
electronicarts: use av_log_ask_for_sample
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 12:51:16 +01:00
Michael Niedermayer
d7da4d47a6
mxfdec: avoid double free and leaks.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 02:20:04 +01:00
Michael Niedermayer
c2ca0163af
matroskadec: check h in generic rm packet shuffler
...
Fixes crash
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11 01:19:44 +01:00
Clément Bœsch
e56b098410
lavf/srtenc: ignore invalid timed packets instead of failing.
...
This way we don't abort in the middle of remuxing, just warn about an
event ignored. The index increment is moved to make sure the output
numbers still make sense.
2012-11-10 22:43:27 +01:00
Michael Niedermayer
eb3dc23705
mov: Make sure no streams after the header lack a timescale.
...
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 13:29:23 +01:00
Piotr Bandurski
cc5c2ef09d
riff: add SMV2 FourCC for H264
...
sample:
http://samples.mplayerhq.hu/V-codecs/smv2.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 13:16:14 +01:00
Carl Eugen Hoyos
b56ff0b261
Allow forcing a frame size in bytes for image2pipe.
...
This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.
Fixes ticket #1869 .
2012-11-10 02:25:17 +01:00
Carl Eugen Hoyos
f91f049a22
Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.
...
Reviewed-by: Paul B Mahol
2012-11-10 02:19:55 +01:00
Piotr Bandurski
49c2f2d57e
riff: add GXVE FourCC for WMV2
...
sample:
http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 01:58:51 +01:00
Michael Niedermayer
c63e76ba35
ebml_read_binary: use fast_padded_malloc()
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-09 23:35:58 +01:00
Michael Niedermayer
e481ba2ed7
vqf: check samplerate, avoid division by 0.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-09 18:05:19 +01:00
Michael Niedermayer
7989f7e0b5
xmv: Fix integer overflow
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-09 17:18:01 +01:00
Michael Niedermayer
7ec1fe1f47
lavf: Dont compare absolute to relative timestamps in duration gcd
...
This prevents a division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-09 14:59:43 +01:00
Michael Niedermayer
1b5a6d3c49
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
flacenc: ensure the order is within the min/max range in LPC order search
avconv: rescale packet duration to muxer time base when flushing encoders
add 24-bit FLAC encoding to Changelog
rtpenc_aac: Fix calculation of the header size
x86: h264_intrapred: port to cpuflags
Conflicts:
Changelog
libavformat/rtpenc_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-09 10:29:51 +01:00
Luca Abeni
e004d175fe
rtpenc_aac: Fix calculation of the header size
...
Previously the high end byte was always set to zero. Also get
rid of an unnecessary multiplication (which in practice couldn't
overflow) before shifting.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-08 19:48:32 +02:00
Michael Niedermayer
5ff43ec72d
sctp: silence const warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-08 16:06:04 +01:00
Michael Niedermayer
60e028958c
ffmdec: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-08 15:54:14 +01:00
Luca Abeni
78e08fd340
rtpenc_aac: Fix 10l bug
...
Fixes CID602564
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-08 01:54:16 +01:00
Peter Ross
a373f35272
wtvenc: produce seekable files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 13:59:03 +01:00
Peter Ross
b89cd2a028
wtvenc: simplify write_timestamp
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 13:51:38 +01:00
Peter Ross
3e65134326
wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 13:45:01 +01:00
Peter Ross
0d9435048c
wtvenc: indent fixup
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 13:44:50 +01:00
Peter Ross
b50759cd6b
wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 13:42:01 +01:00
Paul B Mahol
7c2cfaac6a
smjpegenc: use bits_per_coded_sample instead of calling function
...
Final result is same and this allows support of multiple values per codec.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-07 01:31:39 +00:00
Nicolas George
e9b8523d52
sbgdec: dont set slide to a uninitialized value
...
Fixed CID703833
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 21:46:22 +01:00
Michael Niedermayer
2ca649f177
utils: fix integer overflow with DURATION_MAX_READ_SIZE
...
Fixes CID703746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 18:44:14 +01:00
Peter Ross
e6ef628b1e
wtv: move duplicated guids into wtv.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:52:33 +01:00
Peter Ross
1701a22fce
wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:51:41 +01:00
Peter Ross
9632f5efcf
wtvenc: fix typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:50:36 +01:00
Michael Niedermayer
2a0dfc51ea
img2enc: support 16bit per sample yuv in split planes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 02:27:04 +01:00
Michael Niedermayer
2c87565147
img2enc: support storing alpha planes too in split plane mode
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 01:42:26 +01:00
Michael Niedermayer
db012e161e
img2enc: Fix yuva with yuv split planes.
...
Previously the chroma planes where corrupted in this case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 01:31:41 +01:00
Michael Niedermayer
67ee2d2f6d
img2enc: check pix_fmt for split planes mode.
...
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 01:31:41 +01:00
Michael Niedermayer
6dfcc7abdd
img2enc: ensure that the codec is rawvideo for split planes mode.
...
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 01:31:41 +01:00
Michael Niedermayer
7d26be63c2
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
...
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
flacenc: use uint64_t for bit counts
flacenc: remove wasted trailing 0 bits
lavu: add av_ctz() for trailing zero bit count
flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
fate: aac: Place LATM tests and general AAC tests in different groups
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 22:51:20 +01:00
Martin Storsjö
f0615557e0
rtmpproto: Use av_strlcat instead of strncat
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.
2012-11-05 21:47:43 +01:00
Paul B Mahol
70727e8774
lavf/avr: make .long_name consistent with others
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-05 20:47:22 +00:00
Michael Niedermayer
282a6308bf
udp: check ff_socket_nonblock() return code
...
Fixes CID733719
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 21:21:04 +01:00
Diego Biurrun
92fec47d69
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
2012-11-05 20:48:50 +01:00
Michael Niedermayer
30d27685b1
segment: fix null ptr deref
...
Fixes CID732220
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 20:26:10 +01:00
Paul B Mahol
962314fe27
AVR demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-05 17:31:22 +00:00
Piotr Bandurski
461797f6aa
riff: add "lsvm" FourCC for H263.
2012-11-05 17:43:01 +01:00
Michael Niedermayer
9829ec1a9c
ffm: redesign header format to make it extensible
...
Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 16:36:44 +01:00
Martin Storsjö
d578f94746
rtmp: Use av_strlcat instead of strncat
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-05 15:37:09 +02:00
Clément Bœsch
a8b3130181
lavf/srtdec: recognize subtitles starting at event index 0.
2012-11-05 07:37:45 +01:00
Michael Niedermayer
e82afa3e2d
filmstripenc: fix rounding that caused fate failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 00:28:21 +01:00
Michael Niedermayer
a147c1b2b1
oggenc: remove unneeded null check.
...
The code would have segfaulted before if it where null
Fixes CID732218
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 00:28:21 +01:00
Paul B Mahol
992a6a53ef
cdxl: add read_probe function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-04 20:19:43 +00:00
Paul B Mahol
c4dd4f19f3
smush: improve probing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-04 16:50:58 +00:00
Paul B Mahol
50d3a1a962
vocenc: fix 10l regression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-04 04:46:10 +00:00
Paul B Mahol
1c5b56eec7
vocenc: abort if unsupported codec is used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-04 03:59:08 +00:00
Michael Niedermayer
5f53138621
movenc: remove unneeded check
...
Fixes CID741417
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-04 01:03:52 +01:00
Paul B Mahol
94f224516c
westwood_aud: remove stale comment
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-03 14:54:17 +00:00
Michael Niedermayer
2581d9bcbb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: add apidoc target for doxygen API documentation
matroskadec: do not use avpacket internals
Conflicts:
doc/Makefile
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:48:51 +01:00
Michael Niedermayer
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
Michael Niedermayer
b7280cff9a
asfdec: check stream_index for validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 05:58:12 +01:00
Michael Niedermayer
e5927910c2
asfdec: flip the interpretation of the header aspect back
...
This reverts 2de8877689
Fixes Ticket 1883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 05:49:07 +01:00
Michael Niedermayer
343c73e252
asfdec: parse aspect ratio payload extension
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 05:49:07 +01:00
Michael Niedermayer
8c93269e42
asfdec: correctly parse payload extensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 05:37:18 +01:00
Michael Niedermayer
2d8c76eb1f
asfdec: parse payload extension list
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 05:35:35 +01:00
Anton Khirnov
9221efef79
lavf: fix av_interleaved_write_frame() doxy.
...
A sentence was mistakenly inserted in the middle of another sentence.
2012-11-02 18:28:56 +01:00
Anton Khirnov
34871beb5e
matroskadec: do not use avpacket internals
2012-11-02 18:28:56 +01:00
Anton Khirnov
717a450993
lavf: clarify the lifetime of demuxed packets.
2012-11-02 18:28:56 +01:00
Paul B Mahol
c39fb30816
smjpegdec: set nb_frames for video stream
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-02 16:32:51 +00:00
Michael Niedermayer
8551c6bec0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dv1394: Swap the min and max values of the 'standard' option
rtpdec_vp8: Don't parse fields that aren't used
lavc: add some AVPacket doxy.
audiointerleave: deobfuscate a function call.
rtpdec: factorize identical code used in several handlers
a64: remove interleaved mode.
doc: Point to the new location of the c99-to-c89 tool
decode_audio3: initialize AVFrame
ws-snd1: set channel layout
wmavoice: set channel layout
wmapro: use AVCodecContext.channels instead of keeping a private copy
wma: do not keep private copies of some AVCodecContext fields
Conflicts:
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-02 14:57:36 +01:00
Martin Storsjö
2b831a59d9
rtpdec_vp8: Don't parse fields that aren't used
...
This avoids warnings about unused variables.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-02 10:59:17 +02:00
Anton Khirnov
fdc8672886
audiointerleave: deobfuscate a function call.
...
right above there is if (pkt) {<do stuff>; pkt = NULL}, so pkt is just a
fancy name for NULL at this point.
2012-11-02 07:58:38 +01:00
Anton Khirnov
179a5c37e0
rtpdec: factorize identical code used in several handlers
2012-11-02 07:58:37 +01:00
Anton Khirnov
f70381ab9d
a64: remove interleaved mode.
...
It has been disabled since it was added two years ago.
2012-11-02 07:58:37 +01:00
Jason
a5f6720f13
Add QT CC track mux support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-02 05:00:27 +01:00
Michael Niedermayer
f742c7b2ce
lavf: fix integer overflow in rfps calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 21:37:29 +01:00
Michael Niedermayer
bacebe1f95
avienc: force a valid timebase for video
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 20:26:59 +01:00
Michael Niedermayer
304ebed586
mpegts_probe: detect files with garbage at the begin.
...
Fixes Ticket1811
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 17:22:04 +01:00
Tomas Härdin
84e7d368d6
mxfdec: Fix inferred misuses of enums
...
This fixes CID 700457, 700458 and 703705.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 16:21:12 +01:00
Michael Niedermayer
e5cf100d3d
mpegvideo_probe: check slice order
...
Fixes: Enrique.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 15:08:03 +01:00
Michael Niedermayer
6992b0bfc2
utils: fix rounding of micro seconds
...
Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 19:12:47 +01:00
Stefano Sabatini
be0b37c649
lavf/avienc: fix/extend error message, in case of too large number of skipped frames
2012-10-31 14:46:40 +01:00
Stefano Sabatini
f35d5f966f
lavf/avienc: enable debug log
2012-10-31 14:46:24 +01:00
Michael Niedermayer
f7a9a99661
wavenc: fix curruption of metadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 21:48:39 +01:00
Michael Niedermayer
a201639a01
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixfmt: support more yuva formats
swscale: support gray to 9bit and 10bit formats
configure: rewrite print_config() function using awk
FATE: fix (AD)PCM test dependencies broken in e519990
Use ptrdiff_t instead of int for intra pred "stride" function parameter.
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 17:47:36 +01:00
Michael Niedermayer
6f5f7f705d
Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
...
* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
Remove INIT_AVX from x86inc.asm.
Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
dv: fix indentation
Conflicts:
libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 15:28:24 +01:00
Michael Niedermayer
e79c3858b3
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
...
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
dv: use AVStream.index instead of abusing AVStream.id
lavfi: add ashowinfo filter
avcodec: Add a RFC 3389 comfort noise codec
lpc: Add a function for calculating reflection coefficients from samples
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
lavr: document upper bound on number of output samples.
lavr: add general API usage doxy
indeo3: remove duplicate capabilities line.
fate: ac3: Add dependencies
Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 14:40:22 +01:00
Michael Niedermayer
cd37963684
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
...
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 13:52:03 +01:00
Luca Barbato
7658295ba3
pixfmt: support more yuva formats
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-30 12:02:42 +01:00
Michael Niedermayer
91295f03d4
mp3dec: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29 22:11:21 +01:00
Anton Khirnov
ede4cedf47
dv: fix indentation
2012-10-29 21:35:09 +01:00
Anton Khirnov
14f031d7ec
dv: use AVStream.index instead of abusing AVStream.id
2012-10-29 21:34:05 +01:00
Martin Storsjö
f21d5c905d
rtsp: Avoid a cast when calling strtol
...
This gets rid of this warning:
libavformat/rtsp.c: In function ‘rtsp_parse_transport’:
libavformat/rtsp.c:794: warning: cast discards qualifiers from pointer target type
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-29 17:47:25 +02:00
Tim Nicholson
8a9b48bfa9
movenc: Add required 'prof' atom to 'tapt' atom set.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29 16:45:37 +01:00
Michael Niedermayer
67420b3de5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: add CODEC_CAP_DR1 to all video decoders missing them
rtpdec: Cosmetic cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29 13:15:27 +01:00
Luca Barbato
d4bff9f1ab
nut: support textual data
...
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
2012-10-29 12:03:28 +01:00
Luca Barbato
07585ffa62
nutenc: verbosely report unsupported negative pts
...
Additionally use the correct error number.
2012-10-29 10:52:13 +01:00
Michael Niedermayer
a3886ea3c5
smoothstreamingenc: check return value of mkdir()
...
Fixes CID732188
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29 03:34:17 +01:00
Michael Niedermayer
b399816d9c
smoothstreamingenc: fix integer overflow
...
Fixes CID732248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29 03:17:08 +01:00
Paul B Mahol
c2e2b3029e
cafdec: fix parsing of chunks which may have unused data
...
Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks
to have data section size larger than chunk's current meaningful
content in order to reserve room for additional data.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-28 20:33:29 +00:00
Clément Bœsch
3d6a246b4b
lavf/srtenc: add AVFMT_TS_NONSTRICT flag.
...
There is not really a problem in having two events at the same time.
Even if it's not perfectly correct, it helps remuxing more files
(typically our FATE sample).
2012-10-28 20:45:58 +01:00
Martin Storsjö
48f01398ba
rtpdec: Cosmetic cleanup
...
Mainly clean up the RTP statistics code, plus a few other obviously
misindentend lines.
Remove some useless comments, de-doxygenize some comments,
add spacing around operators and fix a typo.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-28 20:50:01 +02:00
Paul B Mahol
07ed191b15
parse ID3v2 chapters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-28 15:10:28 +00:00
Carl Eugen Hoyos
96fac764fa
Add an additional AAC TwoCC.
...
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
Originally committed to vlc by Jean-Baptiste.
2012-10-28 14:50:11 +01:00
bbraun
d72aef4e92
movenc: add more metadata types
...
Fixes Ticket1052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 14:36:57 +01:00
Michael Niedermayer
c73fcc8de3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
yuv4mpeg: reject unsupported codecs
nutenc: K&R formatting cosmetics
assdec: fix qsort() callback signature
configure: detect sparc64 automatically
vp8: fix memset() crossing array boundary
h264: fix invalid pointer arithmetic
amrwbdec: fix invalid pointer arithmetic
Conflicts:
libavformat/nutenc.c
libavformat/yuv4mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 14:24:27 +01:00
Michael Niedermayer
8943ad4014
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
...
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
avio: fix pointer type mismatches in avio_enum_protocols()
avserver: use socklen_t where appropriate
udp: use socklen_t where appropriate
network: use HAVE_THREADS instead of local hack
af_channelmap: remove stray enum declaration
buffersink: remove stray semicolon after function definition
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 13:19:11 +01:00
Luca Barbato
424b1e7642
yuv4mpeg: reject unsupported codecs
...
The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.
2012-10-28 05:07:55 +01:00
Luca Barbato
fce4450dec
nutenc: K&R formatting cosmetics
2012-10-28 05:07:55 +01:00
Michael Niedermayer
0f943ed3c8
swfenc: zero fifo after freeing
...
Fixes CID602000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 23:03:07 +02:00
Piotr Bandurski
2ef26b5e73
riff: support 0xa100 TwoCC
...
fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 21:41:59 +02:00
Mans Rullgard
4cbae57cef
assdec: fix qsort() callback signature
...
This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 18:26:28 +01:00
Mans Rullgard
4521645b1a
avio: fix pointer type mismatches in avio_enum_protocols()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 13:43:44 +01:00
Mans Rullgard
be2efe0c7b
udp: use socklen_t where appropriate
...
getsockname() takes a pointer to socklen_t which is not necessarily
int.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 13:11:46 +01:00
Mans Rullgard
9efbfe57e0
network: use HAVE_THREADS instead of local hack
...
HAVE_THREADS is set in config.h if pthreads or w32threads is
available, which presumably the proper condition here.
Also fixes undefined behaviour in preprocessor directives.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 13:11:17 +01:00
Michael Bradshaw
c430cb49fd
Update my email address
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 02:06:21 +02:00
Clément Bœsch
5f0105b820
lavf/srtenc: allow zero duration events.
...
This is useful when you want to remux events with zero (or too small)
durations.
2012-10-26 21:48:27 +02:00
Paul B Mahol
adc61d68b0
bit: check av_new_packet() return value
...
Fixes CID703626.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-26 15:34:25 +00:00
Michael Niedermayer
c01a462cda
rmdec: fix null derefercne
...
Fixes CID733714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 16:18:09 +02:00
Michael Niedermayer
1bf5071104
rmdec: use av_assert for audio_pkt_cnt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 16:13:16 +02:00
Michael Niedermayer
9aa630a520
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: sanitise sparc vis check
configure: recognise more sparc variants as --cpu argument
build: Include HEADERS-yes in the HEADERS variable
pcm: change references to raw to pcm
ffv1: set the range coder state in decode_slice_header
pcmdec: change default of channels parameter to 1
Conflicts:
libavformat/pcmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 15:20:48 +02:00
Paul B Mahol
7fe6f6e2b1
caf muxer: write metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-26 03:12:45 +00:00
Michael Niedermayer
507f2940cc
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
...
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
avconv: fix bitrate report when writing to /dev/null
avfilter: fix graphparser memleaks on error paths
rawdec: remove ff_raw_read_header
pcmdec: remove dependency from rawdec
g722: refactor out of rawdec.c
rawvideo: use a specific read_header
Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 14:24:57 +02:00
Matthieu Bouron
cfb1c3c9f0
aiffdec: read ID3 attached pictures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 01:52:40 +02:00