35950 Commits

Author SHA1 Message Date
Michael Niedermayer
54aa78adaa h264: fix midstream extardata handling with dump.f4v
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4755df5236551ab53a5bf4b970748809593adf6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:24:36 +01:00
Michael Niedermayer
c575d63ac2 ffmpeg: reset dts/pts after decoding the first subpacket
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c39b3c278e2367056c7b53c8d48d4259a085e61)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:24:04 +01:00
Martin Storsjö
3f1e77a44c flvenc: Support muxing 16 kHz nellymoser
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit bd2ff1a8bc01668b66314c20494c839f774de38e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:23:17 +01:00
Mans Rullgard
923deca05f v410enc: fix output buffer size check
The encoder clearly needs width * height * 4 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dabba0c676389b73c7b324fc999da7076fae149e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:22:26 +01:00
Michael Niedermayer
d1f74d838e jpegdec: check return value of mjpeg_decode_dc()
Fixes Ticket754

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 484b1cdd5303771447e15d0067a2034b0c17fdc8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:43 +01:00
Michael Niedermayer
07892e33ef h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d998a6ddeef987bbd82fad474b02cddc681a7c6a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:34 +01:00
Shitiz Garg
0c62a00e68 westwood: Make sure audio header info is present when parsing audio packets
Audio header information might get scrambled and would not parse,
yet wsqva_read_packet would try to parse audio packets causing
segfaults such as floating point exception.

Fixes bugzilla #141.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 566ee0eaf1543101f7a441cc42e3ddad097363bf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:40 +01:00
Martin Storsjö
1804becb30 libgsm: Reset the MS mode of GSM in the flush function
The mode is set in libgsm_decode_init, but the decoder
object is simply destroyed and recreated in the flush
function - therefore the mode has to be set again.

This fixes playback using the libgsm_ms decoder in avplay.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1b35af3225392a5328f6534c53e96a56cd5eb305)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:22 +01:00
Martin Storsjö
a11c9d7778 libgsm: Set options on the right object
This fixes regressions in decoding using the libgsm_ms decoder,
broken since 0eea21294354.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 8637af8d2499e72ad6662627dae9f245e3e961df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:39 +01:00
Michael Niedermayer
1d23f5bbef h263dec: Fix regression / crash with lowres.
Fixes Ticket757
Bug Found by: ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21270cffaeab2f67a613907516b2b0cd6c9eacf4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:13 +01:00
Michael Niedermayer
c0ff6b6378 flicvideo: input buffer pointer checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 30b996d443aeb105d0017b06ce590c55a0b2f9f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:01 +01:00
Michael Niedermayer
6a805e5334 flicvideo: fix overread.
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit afb2bac48d0d044718c2da3d34a97bee244be2e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:50 +01:00
Michael Niedermayer
6b7a14e599 aacsbr: Fix memory corruption.
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 944f5b2779e4aa63f7624df6cd4de832a53db81b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:42 +01:00
Michael Niedermayer
b6c19c9c91 h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7fff64e00d886fde11d61958888c82b461cf99b9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:26 +01:00
Michael Niedermayer
e8bd1af095 indeo3: check return values of allocate_frame_buffers()
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd645c15d8d91444e49aea589ace4d9f76210641)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:07 +01:00
Michael Niedermayer
09453e6bd3 mtv: Fix FPE with 0 dimensions.
Fixes Ticket755
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b9b6332dfeb169098c8ab1351d66fc5b474dd55)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:02 +01:00
Martin Storsjö
bf9af661b8 applehttp: Properly clean up if unable to probe a segment
This avoids a segfault if the probe function wasn't able to
determine the format.

The bug was found by Panagiotis H.M. Issaris.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 115a57302a7d6661426304bec3a5bc72d0edf4b0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:12:33 +01:00
Martin Storsjö
63d5fa55fe applehttp: Avoid reading uninitialized memory
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit c41b9842ceac42bedfd74a7ba2d02add82f818a9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:56 +01:00
Carl Eugen Hoyos
d344e45f19 Detect 'yuv2' as rawvideo also in avi.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:28 +01:00
Michael Niedermayer
485d088f94 fate: fix v410 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a11e7ffbaaade9630e492ebfabfd587e191df72)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:50 +01:00
Derek Buitenhuis
84f3bdb8f4 fate: Add FATE tests for v410 encoder and decoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 64a0b826e1d4731f82fcbbc1137c897945a5477c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:43 +01:00
Derek Buitenhuis
93442a27c5 v410 encoder and decoder
v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 309ffa4fe3388d842a51000dc7d56abac53ff759)

Conflicts:

	libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:26 +01:00
Michael Niedermayer
bfe7d96ed2 MAINTAINERS: add 0.9
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 635a301683db314aa21717276420ad8b5267f07e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:56:28 +01:00
Reimar Döffinger
97e6a0fa2a Support "VLB " audio in NSV files.
See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 36be045ed7942e07742c3cf3d3012b1d2a9ec344)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:55:05 +01:00
Michael Niedermayer
9e4d30397b decoding example: reset pts/dts after subpacket.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0e187fd13c2e38e8ec90757101c33410c69ac16a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:52:37 +01:00
Gaurav Narula
399e5b675b ulti: Fix invalid reads
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a99273ebf328658c183c2d267f1c2b8bfac58bb3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:52:21 +01:00
Michael Niedermayer
0a2fbb0a84 msrledec: Check for overreads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 53be37e368928e7f274e33ef8d118109da373c79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:51:52 +01:00
Michael Niedermayer
b4ad641334 aascdec: Check input buffer size on raw data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be5db7004f9d7b42b5ae9068b181dff383367e36)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:51:42 +01:00
Anton Khirnov
60cb07196f lavf: add avformat_close_input().
It sets the supplied AVFormatContext pointer to NULL after freeing it,
which is safer and its name is consistent with other lavf functions.

Also deprecate av_close_input_file().
(cherry picked from commit 526604545fb1cc0c11af356fbffd5cddf8cdc95f)

Conflicts:

	doc/APIchanges
	libavformat/utils.c
	libavformat/version.h
2012-01-03 17:47:08 +01:00
Michael Niedermayer
c30e59383b cljrdec: improve scaling somewhat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7e5cbb3c2d96c27d526aa69cbdbd1ab23739d7e5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:20:40 +01:00
Michael Niedermayer
b9e09c9eab cljrenc: fix scaling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a1ca45317df0993e98b4e3aec9ebdae64449478b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:20:31 +01:00
Clément Bœsch
dfdf616773 mp3enc: fix playback with mp3 encoded files on some devices.
This partially reverts 1fea432b; header variable needs to keep its value
in case it triggers "if (needed <= c.frame_size)".
(cherry picked from commit e1a8164d62fb8d1943b3f7a66500f0315ca8fe76)

Conflicts:

	libavformat/mp3enc.c
2012-01-03 15:07:45 +01:00
Michael Niedermayer
46d0aee3c4 lavc: Do not fail audio decoding if user has set a custom get_buffer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3846e3ebab610be691adb8b40d376dc2f675dc4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 15:07:45 +01:00
Carl Eugen Hoyos
55e2dc7f77 Fix channel order for some less common TrueHD layouts.
Reported and tested by TDiTP_

Fixes ticket #779.
(cherry picked from commit 1af0ace3a4b8aa8c6240a99de3c40f495ab279e9)
2012-01-03 14:05:30 +01:00
Hendrik Leppkes
a46fa584c5 mlpdec: fix channel order for wide 7.1 truehd layouts
(cherry picked from commit b9d8af03270223202c9a991655d3f75b5a8b56b5)
2012-01-03 14:05:21 +01:00
Carl Eugen Hoyos
980e4263bc Add missing PIX_FMT_NONE to libopenjpegenc
fixes ticket #813

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ef611095f0d0c1256cbb6654f94cae61a60f2736)
2012-01-03 13:54:11 +01:00
Michael Niedermayer
2a442eb70f h264: Fix frame sync / random access handling.
It seems I have misunderstood the spec when I implemented this
originally.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ba43e50efa2483fb3ca1e3f62a474db7dd3ac8d)
2012-01-03 13:34:37 +01:00
Michael Niedermayer
23ed56d307 h264: Fix seeking in 00017.MTS
Fixes Ticket852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9d9316ae34ea2a5e481ac15f31d42c87a8ef4380)
2012-01-03 13:34:30 +01:00
Michael Niedermayer
b84683a906 h264: Fix recovery_frame initialization when recovery_frame is -1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fba6777363eb74d926aa0eed281a77ff152a3ad5)
2012-01-03 13:34:27 +01:00
Michael Niedermayer
01ff5378f0 h264: reset picture->sync on allocation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36fa781bd6b4e0f40abd31431af2d29d87e9b194)
2012-01-03 13:34:23 +01:00
Michael Niedermayer
96545777d7 h264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ecb14b8af73b92e5a1be47c119d2f528ff402ebd)
2012-01-03 13:34:15 +01:00
Michael Niedermayer
1506becf36 h264: Print pass in NAL debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 393253b4b3b454830b22c8e69acbe11e2684da7e)
2012-01-03 13:26:56 +01:00
Tom Evans
f7c196a1f9 libavdevice: Fix v4l2 compilation under FreeBSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ffa1f541b350946591ea80e134917b28a860fcad)
2011-12-28 02:10:31 +01:00
Michael Niedermayer
7614facf8a h264: fix init of topleft ref/mv.
Fixes Ticket778

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4d70023a2a83c5c7690708a5a5acfe8ac8ed8f19)
2011-12-18 02:10:59 +01:00
Tomas Härdin
35a42ca0bf mxfdec: Only use the new demuxing logic for OPAtom
This is a stopgap for ticket #746.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:35 +01:00
Michael Niedermayer
de69052b1a ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
bf928ebed2 4xm: check if there are bits left in decode_i_block()
Fixed Ticket753
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1ba29c76430ce511fd901c8b7a1bd199b169dc0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
f52324629a riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
(cherry picked from commit 76b9a0961c33c9eb19b220c6f0edfbb3e79fcd59)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
eee78ef30d ffplay: clear pkt_temp when pkt is freed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit efe8a1ba08dd868e5a96f5759258b0733bb2004c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
f600d709f0 ffplay: Fix got_frame type.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit a5a1e3cb8a5f554818c2e491ab4d2cad833a4556)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00