ffmpeg.git
9 years agolavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
Paul B Mahol [Mon, 2 Jan 2012 17:49:38 +0000 (17:49 +0000)]
lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix compiler warning for uninitialized variables
Jean First [Mon, 2 Jan 2012 23:28:06 +0000 (00:28 +0100)]
ffmpeg: fix compiler warning for uninitialized variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agowtvdec: use intfloat.h instead of intfloat_readwrite.h
Jean First [Mon, 2 Jan 2012 23:28:08 +0000 (00:28 +0100)]
wtvdec: use intfloat.h instead of intfloat_readwrite.h

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: use avformat_close_input instead of av_close_input_file
Jean First [Mon, 2 Jan 2012 23:28:05 +0000 (00:28 +0100)]
ffmpeg: use avformat_close_input instead of av_close_input_file

Signed-off-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovp3: remove redeclaration of vp3_decode_flush
Jean First [Mon, 2 Jan 2012 23:28:04 +0000 (00:28 +0100)]
vp3: remove redeclaration of vp3_decode_flush

Signed-off-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 3 Jan 2012 01:25:56 +0000 (02:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegenc: use avctx->slices as number of slices
  v410enc: fix undefined signed left shift caused by integer promotion
  Release notes: mention cleaned up header includes
  fix Changelog file
  Fix a bunch of typos.
  Drop some pointless void* return value casts from av_malloc() invocations.
  wavpack: fix typos in previous cosmetic clean-up commit
  wavpack: cosmetics: K&R pretty-printing
  avconv: remove the 'codec framerate is different from stream' warning
  wavpack: determine sample_fmt before requesting a buffer
  bmv audio: implement new audio decoding API
  mpegaudiodec: skip all channels when skipping granules
  mpegenc: simplify muxrate calculation

Conflicts:
Changelog
avconv.c
doc/RELEASE_NOTES
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegenc: use avctx->slices as number of slices
Janne Grunau [Sun, 1 Jan 2012 19:24:24 +0000 (20:24 +0100)]
mpegenc: use avctx->slices as number of slices

Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.

9 years agov410enc: fix undefined signed left shift caused by integer promotion
Janne Grunau [Mon, 2 Jan 2012 14:47:26 +0000 (15:47 +0100)]
v410enc: fix undefined signed left shift caused by integer promotion

9 years agojpegdec: non interleaved rgb ljpeg support.
Michael Niedermayer [Mon, 2 Jan 2012 18:06:46 +0000 (19:06 +0100)]
jpegdec: non interleaved rgb ljpeg support.

Fixes Ticket856

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agojpegdec: 9-16 bit yuv/gray ljpeg support.
Michael Niedermayer [Mon, 2 Jan 2012 16:03:24 +0000 (17:03 +0100)]
jpegdec: 9-16 bit yuv/gray ljpeg support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agojpegdec: Only enable rgb mode when there are 3 components.
Michael Niedermayer [Mon, 2 Jan 2012 16:02:41 +0000 (17:02 +0100)]
jpegdec: Only enable rgb mode when there are 3 components.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRelease notes: mention cleaned up header includes
Reinhard Tartler [Mon, 2 Jan 2012 16:01:56 +0000 (17:01 +0100)]
Release notes: mention cleaned up header includes

A rebuild in debian revealed that this broke compilation of a number packages:
http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=siretart@tauware.de;tag=ftbfs-libav0.8

9 years agofix Changelog file
Reinhard Tartler [Mon, 2 Jan 2012 15:58:16 +0000 (16:58 +0100)]
fix Changelog file

Both the Indeo 4 decoder and the SMJPEG demuxer were included in the
0.8_beta1 release.

9 years agoFix a bunch of typos.
Diego Biurrun [Tue, 20 Dec 2011 14:39:22 +0000 (15:39 +0100)]
Fix a bunch of typos.

9 years agoDrop some pointless void* return value casts from av_malloc() invocations.
Diego Biurrun [Sat, 31 Dec 2011 15:30:59 +0000 (16:30 +0100)]
Drop some pointless void* return value casts from av_malloc() invocations.

9 years agoMAINTAINERS: update release maintainers
Michael Niedermayer [Mon, 2 Jan 2012 15:01:33 +0000 (16:01 +0100)]
MAINTAINERS: update release maintainers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovp3: fix regression with mplayer-crash.ogv
Michael Niedermayer [Mon, 2 Jan 2012 14:27:43 +0000 (15:27 +0100)]
vp3: fix regression with mplayer-crash.ogv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomp3enc: fix playback with mp3 encoded files on some devices.
Clément Bœsch [Mon, 2 Jan 2012 08:39:11 +0000 (09:39 +0100)]
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)".

9 years agodrawtext: fix hard dependency to lavc (timecode).
Clément Bœsch [Wed, 28 Dec 2011 09:09:45 +0000 (10:09 +0100)]
drawtext: fix hard dependency to lavc (timecode).

9 years agowavpack: fix typos in previous cosmetic clean-up commit
Justin Ruggles [Mon, 2 Jan 2012 13:54:30 +0000 (08:54 -0500)]
wavpack: fix typos in previous cosmetic clean-up commit

9 years agowavpack: cosmetics: K&R pretty-printing
Justin Ruggles [Mon, 2 Jan 2012 05:14:16 +0000 (00:14 -0500)]
wavpack: cosmetics: K&R pretty-printing

9 years agoavconv: remove the 'codec framerate is different from stream' warning
Anton Khirnov [Sat, 24 Dec 2011 14:08:07 +0000 (15:08 +0100)]
avconv: remove the 'codec framerate is different from stream' warning

Codec timebase is not framerate and the situation when it's different
from AVStream.r_frame_rate is quite common, nothing to warn about.

9 years agowavpack: determine sample_fmt before requesting a buffer
Hendrik Leppkes [Fri, 16 Dec 2011 21:41:29 +0000 (22:41 +0100)]
wavpack: determine sample_fmt before requesting a buffer

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
9 years agobmv audio: implement new audio decoding API
Justin Ruggles [Sat, 31 Dec 2011 20:47:30 +0000 (15:47 -0500)]
bmv audio: implement new audio decoding API

9 years agompegaudiodec: skip all channels when skipping granules
Justin Ruggles [Sun, 1 Jan 2012 00:24:30 +0000 (19:24 -0500)]
mpegaudiodec: skip all channels when skipping granules

Also fix calculation of new position when switching buffers.
This fixes "overread" error messages when seeking.

9 years agoflvdec: use av_uninit to silence compiler warnings
Jean First [Sun, 1 Jan 2012 22:59:00 +0000 (23:59 +0100)]
flvdec: use av_uninit to silence compiler warnings

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoy41p encoder and decoder
Paul B Mahol [Sun, 1 Jan 2012 12:16:42 +0000 (12:16 +0000)]
y41p encoder and decoder

y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree.

Fixes issue 1123 / ticket #102.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kdec: av_log formatting use %tx instead of %x
Jean First [Sun, 1 Jan 2012 21:08:17 +0000 (22:08 +0100)]
j2kdec: av_log formatting use %tx instead of %x

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "mpegvideo: Do not error out on default values of thread_count."
Michael Niedermayer [Mon, 2 Jan 2012 02:10:52 +0000 (03:10 +0100)]
Revert "mpegvideo: Do not error out on default values of thread_count."

This is not needed anymore.

This reverts commit ca0350f49b82663123f7fb4fddcafa7c874a96a4.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 2 Jan 2012 01:48:34 +0000 (02:48 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
ffplay.c
libavcodec/avcodec.h
libavcodec/pthread.c
libavcodec/version.h
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegenc: simplify muxrate calculation
Janne Grunau [Sun, 1 Jan 2012 22:32:15 +0000 (23:32 +0100)]
mpegenc: simplify muxrate calculation

The fate-h264-bsf-mp4toannexb failures were caused by an integer
overflow of the unneeded multiplication.

Inspired by patch by: Michael Niedermayer <michaelni@gmx.at>

9 years agoAdd missing PIX_FMT_NONE to libopenjpegenc
Carl Eugen Hoyos [Sun, 1 Jan 2012 20:52:45 +0000 (21:52 +0100)]
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>
9 years agoCosmetics: Replace -1 with PIX_FMT_NONE.
Paul B Mahol [Sun, 1 Jan 2012 22:23:58 +0000 (23:23 +0100)]
Cosmetics: Replace -1 with PIX_FMT_NONE.

9 years agoavconv: make -frames work for all types of streams, not just video.
Anton Khirnov [Sun, 1 Jan 2012 20:51:26 +0000 (21:51 +0100)]
avconv: make -frames work for all types of streams, not just video.

9 years agobfi: K&R cosmetics
Aneesh Dogra [Sun, 1 Jan 2012 16:37:54 +0000 (22:07 +0530)]
bfi: K&R cosmetics

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agobgmc: K&R cleanup
Aneesh Dogra [Sat, 31 Dec 2011 12:30:22 +0000 (18:00 +0530)]
bgmc: K&R cleanup

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agorawdec: Set start_time to 0 for raw audio files.
Reimar Döffinger [Wed, 28 Dec 2011 05:50:32 +0000 (00:50 -0500)]
rawdec: Set start_time to 0 for raw audio files.

None of the raw audio files have timestamps, thus setting
start_time to 0 should be reasonable.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoDetect 'yuv2' as rawvideo also in avi.
Carl Eugen Hoyos [Wed, 28 Dec 2011 05:50:31 +0000 (00:50 -0500)]
Detect 'yuv2' as rawvideo also in avi.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agorawdec: propagate pict_type information to the output frame
Stefano Sabatini [Wed, 28 Dec 2011 05:50:28 +0000 (00:50 -0500)]
rawdec: propagate pict_type information to the output frame

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agorawdec: Support more QT 1bpp rawvideo files.
Piotr Bandurski [Wed, 28 Dec 2011 05:50:25 +0000 (00:50 -0500)]
rawdec: Support more QT 1bpp rawvideo files.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavconv: free bitstream filters
Janne Grunau [Sun, 1 Jan 2012 16:56:28 +0000 (17:56 +0100)]
avconv: free bitstream filters

9 years agoh264: Fix frame sync / random access handling.
Michael Niedermayer [Sat, 31 Dec 2011 21:16:57 +0000 (22:16 +0100)]
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>
9 years agoh264: Fix recovery_frame initialization when recovery_frame is -1
Michael Niedermayer [Sat, 31 Dec 2011 21:15:45 +0000 (22:15 +0100)]
h264: Fix recovery_frame initialization when recovery_frame is -1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: reset picture->sync on allocation.
Michael Niedermayer [Sat, 31 Dec 2011 21:14:53 +0000 (22:14 +0100)]
h264: reset picture->sync on allocation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomov: av_dlog use PRId64 instead of %ld
Jean First [Sun, 1 Jan 2012 15:26:15 +0000 (16:26 +0100)]
mov: av_dlog use PRId64 instead of %ld

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxfdec: change av_log formatting %lx to PRIx64 and %li to PRIi64
Jean First [Sun, 1 Jan 2012 15:26:12 +0000 (16:26 +0100)]
mxfdec: change av_log formatting %lx to PRIx64 and %li to PRIi64

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agothreads: limit the number of automatic threads to MAX_AUTO_THREADS
Janne Grunau [Sun, 1 Jan 2012 16:35:16 +0000 (17:35 +0100)]
threads: limit the number of automatic threads to MAX_AUTO_THREADS

The extra thread added in {frame_}*thread_init was not taken into
account. Explicitly sets thread_count to 1 if only one CPU core was
detected. Also fixes two typos in comments.

9 years agoh264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Michael Niedermayer [Sun, 1 Jan 2012 15:09:23 +0000 (16:09 +0100)]
h264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: Print pass in NAL debug output
Michael Niedermayer [Sun, 1 Jan 2012 14:27:38 +0000 (15:27 +0100)]
h264: Print pass in NAL debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavplay: K&R cleanup
Aneesh Dogra [Sun, 1 Jan 2012 12:21:26 +0000 (17:51 +0530)]
avplay: K&R cleanup

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agofate: use rgb24 as output format for dfa tests
Janne Grunau [Sun, 1 Jan 2012 15:32:25 +0000 (16:32 +0100)]
fate: use rgb24 as output format for dfa tests

Palette is as supposed in native endianness. Converting the pal8 output
to rgb24 is thus necessary for identical CRCs on big and little endian
systems.

9 years agoaf_astreamsync: remove unused variable
Jean First [Sun, 1 Jan 2012 15:26:11 +0000 (16:26 +0100)]
af_astreamsync: remove unused variable

Signed-off-by: Jean First <jeanfirst@gmail.com>
9 years agovf_tinterlace: implement interlace mode 5
Stefano Sabatini [Sat, 31 Dec 2011 13:12:01 +0000 (14:12 +0100)]
vf_tinterlace: implement interlace mode 5

Allow creating interlaced bottom field first video.

9 years agothreads: set thread_count to 1 when thread support is disabled
Janne Grunau [Sun, 1 Jan 2012 13:17:32 +0000 (14:17 +0100)]
threads: set thread_count to 1 when thread support is disabled

9 years agothreads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264
Janne Grunau [Sun, 1 Jan 2012 13:21:50 +0000 (14:21 +0100)]
threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Some external codecs have their own code to determine the best number
of threads. This number is not necessary the number of cpu cores.
Thread_count will be only 0 if the codec has CODEC_CAP_AUTO_THREADS.

9 years agoUpdate copyright year.
Carl Eugen Hoyos [Sun, 1 Jan 2012 04:04:25 +0000 (05:04 +0100)]
Update copyright year.

9 years agoSupport gray8a pam encoding.
Carl Eugen Hoyos [Sun, 1 Jan 2012 03:44:46 +0000 (04:44 +0100)]
Support gray8a pam encoding.

9 years agompegpsenc: Fix integer overflow of the muxrate calculation.
Michael Niedermayer [Sun, 1 Jan 2012 02:46:06 +0000 (03:46 +0100)]
mpegpsenc: Fix integer overflow of the muxrate calculation.

this should fix the failure of h264-bsf-mp4toannexb on freebsd/openbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopthread: dont autoenable frame threads with visualization
Michael Niedermayer [Sun, 1 Jan 2012 01:54:31 +0000 (02:54 +0100)]
pthread: dont autoenable frame threads with visualization

This combination doesnt work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopthread: Limit automatic threads to mb_height.
Michael Niedermayer [Sun, 1 Jan 2012 00:21:31 +0000 (01:21 +0100)]
pthread: Limit automatic threads to mb_height.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert 464f26889c99f194d112fcf1197795d341fad38b
Michael Niedermayer [Sun, 1 Jan 2012 00:13:06 +0000 (01:13 +0100)]
Revert 464f26889c99f194d112fcf1197795d341fad38b

The code is not needed for us and it doesnt work completely.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosvq3: Fix memory corruption introduced by automatic thread_count.
Michael Niedermayer [Sat, 31 Dec 2011 23:39:29 +0000 (00:39 +0100)]
svq3: Fix memory corruption introduced by automatic thread_count.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegvideo: Do not error out on default values of thread_count.
Michael Niedermayer [Sat, 31 Dec 2011 23:27:36 +0000 (00:27 +0100)]
mpegvideo: Do not error out on default values of thread_count.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 31 Dec 2011 22:24:53 +0000 (23:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add tests for dfa
  mpegaudiodec: fix seeking.
  mpegaudiodec: fix compilation when testing the unchecked bitstream reader
  threads: add sysconf based number of CPUs detection
  threads: always include necessary headers for number of CPUs detection
  threads: default to automatic thread count detection
  Changelog: restore version <next> header
  cook: K&R formatting cosmetics

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not map asf metadata key WM/Track to track.
Carl Eugen Hoyos [Sat, 31 Dec 2011 21:33:58 +0000 (22:33 +0100)]
Do not map asf metadata key WM/Track to track.

WM/Track is 0-based (and deprecated in favour of WM/TrackNumber),
track is 1-based.

Fixes ticket #825.

9 years agoFATE: add tests for dfa
Oana Stratulat [Thu, 29 Dec 2011 20:47:59 +0000 (22:47 +0200)]
FATE: add tests for dfa

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
9 years agoOnly expand raw and packed 1bpp tiff horizontally if it is palettised.
Carl Eugen Hoyos [Sat, 31 Dec 2011 19:45:04 +0000 (20:45 +0100)]
Only expand raw and packed 1bpp tiff horizontally if it is palettised.

9 years agoh264: Fix seeking in 00017.MTS
Michael Niedermayer [Sat, 31 Dec 2011 19:25:02 +0000 (20:25 +0100)]
h264: Fix seeking in 00017.MTS
Fixes Ticket852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegaudiodec: fix seeking.
Ronald S. Bultje [Fri, 30 Dec 2011 21:08:21 +0000 (13:08 -0800)]
mpegaudiodec: fix seeking.

The safe bitstream reader does not allow using skip_bits_long() to seek to a
point before the start of the buffer, which was needed by the mp3 decoder.
This change instead calculates the start point of the first valid granule and
skips to that position.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
9 years agompegaudiodec: fix compilation when testing the unchecked bitstream reader
Justin Ruggles [Sat, 31 Dec 2011 18:36:48 +0000 (13:36 -0500)]
mpegaudiodec: fix compilation when testing the unchecked bitstream reader

9 years agothreads: add sysconf based number of CPUs detection
Janne Grunau [Fri, 23 Dec 2011 23:27:12 +0000 (00:27 +0100)]
threads: add sysconf based number of CPUs detection

Can act as fallback and should work on a couple of Unix systems.

9 years agothreads: always include necessary headers for number of CPUs detection
Janne Grunau [Fri, 23 Dec 2011 23:04:16 +0000 (00:04 +0100)]
threads: always include necessary headers for number of CPUs detection

Since the conditions for the actual usage are more specific a less
preferred method can be used. This would cause compilation errors
because necessary headers are not included.

9 years agothreads: default to automatic thread count detection
Janne Grunau [Sun, 25 Dec 2011 10:45:05 +0000 (11:45 +0100)]
threads: default to automatic thread count detection

9 years agoChangelog: restore version <next> header
Janne Grunau [Sat, 31 Dec 2011 16:31:02 +0000 (17:31 +0100)]
Changelog: restore version <next> header

Indeo 4 decoder and SMJPEG demuxer are not included in 0.8_beta1. Move
them to version <next>.

9 years agomxg: fix compiler warning for uninitialized variables
Michael Niedermayer [Sat, 31 Dec 2011 15:51:35 +0000 (16:51 +0100)]
mxg: fix compiler warning for uninitialized variables

Based on work by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoid3v2: fix compiler warning for uninitialized variables
Jean First [Fri, 30 Dec 2011 20:08:03 +0000 (21:08 +0100)]
id3v2: fix compiler warning for uninitialized variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaacdec: Evaluate further PCE elements.
Michael Niedermayer [Fri, 30 Dec 2011 19:36:11 +0000 (20:36 +0100)]
aacdec: Evaluate further PCE elements.

Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix mono* pam encoding.
Carl Eugen Hoyos [Sat, 31 Dec 2011 16:15:43 +0000 (17:15 +0100)]
Fix mono* pam encoding.

9 years agolibvorbis: proper error logging and return.
Nicolas George [Fri, 30 Dec 2011 22:10:41 +0000 (23:10 +0100)]
libvorbis: proper error logging and return.

9 years agoAvoid uninitialized data in lcldec when ofs is 0 in MSZH.
Reimar Döffinger [Fri, 30 Dec 2011 09:42:55 +0000 (10:42 +0100)]
Avoid uninitialized data in lcldec when ofs is 0 in MSZH.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agolavfi: add amerge audio filter.
Nicolas George [Sun, 6 Nov 2011 20:28:05 +0000 (21:28 +0100)]
lavfi: add amerge audio filter.

9 years agolavfi: add astreamsync audio filter.
Nicolas George [Wed, 14 Dec 2011 20:33:48 +0000 (21:33 +0100)]
lavfi: add astreamsync audio filter.

9 years agolavf: ffio_limit(), treat avio_size()==0 as error.
Michael Niedermayer [Sat, 31 Dec 2011 14:27:51 +0000 (15:27 +0100)]
lavf: ffio_limit(), treat avio_size()==0 as error.

This works around issues arising from inputs that claim to have a
filesize of 0.

Reported-by: buzz_
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavd/lavfi: fix compiler warning for uninitialized variables
Jean First [Fri, 30 Dec 2011 20:07:59 +0000 (21:07 +0100)]
lavd/lavfi: fix compiler warning for uninitialized variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agolavfi: port tinterlace filter from MPlayer
Stefano Sabatini [Sat, 25 Jun 2011 11:06:24 +0000 (13:06 +0200)]
lavfi: port tinterlace filter from MPlayer

Port MPlayer tinterlace filter from MPlayer, with some ideas taken
from the FFmbc/libavfilter port, with the following main differences:

* added support for full-scale YUVJ formats
* added support for YUVA420P
* request_frame() on the filter is forced to return a frame
* some code factorization (related to the copy_picture_fields() function)
* fixed black padding values for mode 3

9 years agolavfi: remove redundant definition of avfilter_copy_frame_props() in avfilter.h
Stefano Sabatini [Tue, 27 Dec 2011 14:12:29 +0000 (15:12 +0100)]
lavfi: remove redundant definition of avfilter_copy_frame_props() in avfilter.h

Rationale: avfilter_copy_frame_props() was already defined in
libavfilter/avcodec.h, and keeping the lavc/lavfi API glue localized in a
specific file should ease maintainance and help the ones which use
libavfilter without depending on libavcodec.

9 years agoRevert "aacdec: Avoid unneeded reinit due to ADTS headers"
Michael Niedermayer [Sat, 31 Dec 2011 03:14:27 +0000 (04:14 +0100)]
Revert "aacdec: Avoid unneeded reinit due to ADTS headers"

This has been fixed differently and its revert avoids error messages
when decoding xx.flv. This also reduces the difference to qatar.

This reverts commit 5a2b3f3a52070232a68582a502fb60a9226ca86a.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotiffdec: hotfix for fate failure.
Michael Niedermayer [Sat, 31 Dec 2011 03:49:33 +0000 (04:49 +0100)]
tiffdec: hotfix for fate failure.

Only use pal8 as output if the file has a palette or more than 2 colors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoflvdec: Check avpriv_mpeg4audio_get_config() return
Michael Niedermayer [Sat, 31 Dec 2011 02:39:22 +0000 (03:39 +0100)]
flvdec: Check avpriv_mpeg4audio_get_config() return

value before using its output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegts: remove unused variable
Jean First [Fri, 30 Dec 2011 20:08:08 +0000 (21:08 +0100)]
mpegts: remove unused variable

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomovenc: remove unused variables
Jean First [Fri, 30 Dec 2011 20:08:05 +0000 (21:08 +0100)]
movenc: remove unused variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocache: use av_freep instead of av_free in cache_open
Jean First [Fri, 30 Dec 2011 20:08:01 +0000 (21:08 +0100)]
cache: use av_freep instead of av_free in cache_open

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocache: remove unused variable in cache_open
Jean First [Fri, 30 Dec 2011 20:08:00 +0000 (21:08 +0100)]
cache: remove unused variable in cache_open

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years ago8svx: remove unused variable in eightsvx_decode_frame
Jean First [Fri, 30 Dec 2011 20:07:58 +0000 (21:07 +0100)]
8svx: remove unused variable in eightsvx_decode_frame

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix decoding some 1bpp tiff files, they are palettized.
Carl Eugen Hoyos [Sat, 31 Dec 2011 01:00:33 +0000 (02:00 +0100)]
Fix decoding some 1bpp tiff files, they are palettized.

Fixes ticket #830.

9 years agoSimplify tiff decoder by merging two functions.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:58:16 +0000 (01:58 +0100)]
Simplify tiff decoder by merging two functions.

9 years agotiff.c: Use switch / case instead of if / else where appropriate.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:53:22 +0000 (01:53 +0100)]
tiff.c: Use switch / case instead of if / else where appropriate.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 31 Dec 2011 00:16:45 +0000 (01:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: whitespace cosmetics
  fate: split off video codec FATE tests into their own file
  fate: split off audio codec FATE tests into their own file
  fate: split off Electronic Arts codec FATE tests into their own file
  fate: split off QuickTime codec FATE tests into their own file
  fate: split off voice codec FATE tests into their own file
  fate: split off demuxer FATE tests into their own file
  cosmetics: Drop unnecessary parentheses around return values.
  fate: drop pointless _audio and _video suffixes from xan tests
  qt-faststart: K&R reformatting; fix comment typos
  FATE: Add test for H.264 MP4->annex.B bitstream filter.

Conflicts:
ffplay.c
tests/fate.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/qtrle.mak
tests/fate/real.mak
tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocook: K&R formatting cosmetics
Shitiz Garg [Fri, 30 Dec 2011 22:18:53 +0000 (03:48 +0530)]
cook: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agomlp_parser: Fix infinite loop with 0 bytes_left.
Michael Niedermayer [Thu, 29 Dec 2011 20:26:30 +0000 (21:26 +0100)]
mlp_parser: Fix infinite loop with 0 bytes_left.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>