]>
git.sesse.net Git - ffmpeg/log
Tom Evans [Thu, 15 Dec 2011 20:21:54 +0000 (20:21 +0000)]
libavdevice: Fix v4l2 compilation under FreeBSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 20:28:24 +0000 (21:28 +0100)]
lavf: update rfps debug code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 20:26:50 +0000 (21:26 +0100)]
lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 19:51:00 +0000 (20:51 +0100)]
mov: Fix near infinite loop in stsd parsing.
Fixes Ticket768
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 19:27:51 +0000 (20:27 +0100)]
westwooddemuxer: use av_get_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 19:25:50 +0000 (20:25 +0100)]
westwooddemuxer: Fix 1gb alloc
Fixes Ticket765
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 15 Dec 2011 18:23:07 +0000 (19:23 +0100)]
Fix linesize for bmp with bitdepth < 8.
Fixes ticket #751.
Nicolas George [Wed, 2 Nov 2011 15:30:27 +0000 (16:30 +0100)]
lavf: add SBG demuxer.
Nicolas George [Wed, 2 Nov 2011 15:29:11 +0000 (16:29 +0100)]
lavc: add ffwavesynth pseudo-codec.
Michael Niedermayer [Thu, 15 Dec 2011 16:24:43 +0000 (17:24 +0100)]
arm: add back ldr_dpren macro that was lost.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 16:23:39 +0000 (17:23 +0100)]
h264: fix midstream extardata handling with dump.f4v
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 14:23:38 +0000 (15:23 +0100)]
jpegdec: check return value of mjpeg_decode_dc()
Fixes Ticket754
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 13:09:23 +0000 (14:09 +0100)]
h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 03:59:21 +0000 (04:59 +0100)]
h263dec: Fix regression / crash with lowres.
Fixes Ticket757
Bug Found by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 03:42:13 +0000 (04:42 +0100)]
flicvideo: input buffer pointer checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 03:24:38 +0000 (04:24 +0100)]
flicvideo: fix overread.
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 02:59:29 +0000 (03:59 +0100)]
aacsbr: Fix memory corruption.
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 01:43:03 +0000 (02:43 +0100)]
h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Dec 2011 00:30:38 +0000 (01:30 +0100)]
indeo3: check return values of allocate_frame_buffers()
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Dec 2011 23:26:14 +0000 (00:26 +0100)]
mtv: Fix FPE with 0 dimensions.
Fixes Ticket755
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Dec 2011 23:10:13 +0000 (00:10 +0100)]
Revert "mpegvideo: remove abort() in ff_find_unused_picture()"
This reverts commit
4f820131fa9fbb0a64d7cc469fa471905fc91944 .
It is better to abort() than to have remotly exploitable arbitrary code
execution bugs. Even more so that this abort has never been triggered
by any input people threw at it.
If after more extensive testing its removial is found safe we can remove
the abort() later.
Michael Niedermayer [Wed, 14 Dec 2011 22:58:10 +0000 (23:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
applehttp: Properly clean up if unable to probe a segment
applehttp: Avoid reading uninitialized memory
fate: Replace misleading "aac" in the name of an ADTS test with "adts".
fate: Drop pointless "-an" from pictor test command.
fate: split off image codec FATE tests into their own file
fate: split off WMA codec FATE tests into their own file
fate: split off lossless video and audio FATE tests into their own files
fate: split off qtrle codec FATE tests into their own file
fate: split off Ut Video codec FATE tests into their own file
fate: split off screen codec FATE tests into their own file
fate: split off Real Inc. codec FATE tests into their own file
fate: split off AC-3 codec FATE tests into their own file
mpegvideo: remove abort() in ff_find_unused_picture()
rv40: NEON optimised loop filter strength selection
rv40: rearrange loop filter functions
configure: cosmetics: sort some lists where appropriate
swscale_mmx: drop no longer required parameters from VSCALEX macros
swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
build: conditionally compile x86 H.264 chroma optimizations
v410 encoder and decoder
...
Conflicts:
Changelog
configure
doc/developer.texi
doc/general.texi
libavcodec/arm/asm.S
libavcodec/avcodec.h
libavcodec/v410dec.c
libavcodec/v410enc.c
libavcodec/version.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libswscale/x86/swscale_mmx.c
tests/Makefile
tests/fate2.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Wed, 14 Dec 2011 21:48:29 +0000 (22:48 +0100)]
dnxhdenc: remove unused variable from context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Dec 2011 21:48:30 +0000 (22:48 +0100)]
ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Dec 2011 21:31:42 +0000 (22:31 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: clear pkt_temp when pkt is freed.
ffplay: Fix got_frame type.
ffplay: add 10 minute seek support to ffplay
ffplay: force setting video mode on fullscreen toggle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Dec 2011 21:20:39 +0000 (22:20 +0100)]
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>
Michael Niedermayer [Wed, 14 Dec 2011 20:23:03 +0000 (21:23 +0100)]
riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
Michael Niedermayer [Tue, 13 Dec 2011 23:38:23 +0000 (00:38 +0100)]
ffplay: clear pkt_temp when pkt is freed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Tue, 13 Dec 2011 23:38:22 +0000 (00:38 +0100)]
ffplay: Fix got_frame type.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Panagiotis H.M. Issaris [Mon, 28 Nov 2011 12:48:13 +0000 (13:48 +0100)]
ffplay: add 10 minute seek support to ffplay
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 13 Dec 2011 22:27:24 +0000 (23:27 +0100)]
ffplay: force setting video mode on fullscreen toggle
Fixes ticket #736. Based on the patch by glangshaw.
Signed-off-by: Marton Balint <cus@passwd.hu>
Martin Storsjö [Wed, 14 Dec 2011 18:34:58 +0000 (20:34 +0200)]
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>
Martin Storsjö [Wed, 14 Dec 2011 18:33:39 +0000 (20:33 +0200)]
applehttp: Avoid reading uninitialized memory
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Wed, 14 Dec 2011 18:31:22 +0000 (19:31 +0100)]
fate: Replace misleading "aac" in the name of an ADTS test with "adts".
Diego Biurrun [Wed, 14 Dec 2011 19:00:33 +0000 (20:00 +0100)]
fate: Drop pointless "-an" from pictor test command.
Diego Biurrun [Wed, 14 Dec 2011 15:25:00 +0000 (16:25 +0100)]
fate: split off image codec FATE tests into their own file
Clément Bœsch [Wed, 14 Dec 2011 19:04:32 +0000 (20:04 +0100)]
fate: split off map_channel tests.
Also introduce a fate-mapchan rule for all of them.
Diego Biurrun [Wed, 14 Dec 2011 18:47:46 +0000 (19:47 +0100)]
fate: split off WMA codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 18:26:00 +0000 (19:26 +0100)]
fate: split off lossless video and audio FATE tests into their own files
Diego Biurrun [Wed, 14 Dec 2011 18:24:42 +0000 (19:24 +0100)]
fate: split off qtrle codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 18:22:03 +0000 (19:22 +0100)]
fate: split off Ut Video codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 13:59:47 +0000 (14:59 +0100)]
fate: split off screen codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 13:47:37 +0000 (14:47 +0100)]
fate: split off Real Inc. codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 13:39:13 +0000 (14:39 +0100)]
fate: split off AC-3 codec FATE tests into their own file
Andrey Utkin [Thu, 8 Dec 2011 11:56:29 +0000 (13:56 +0200)]
mpegvideo: remove abort() in ff_find_unused_picture()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Panagiotis H.M. Issaris [Wed, 14 Dec 2011 16:15:53 +0000 (17:15 +0100)]
Prevent segfault if iformat was not yet initialized.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Wed, 14 Dec 2011 13:30:39 +0000 (14:30 +0100)]
mpeg12enc: fix drop_frame_timecode value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:11:10 +0000 (15:11 +0100)]
Cosmetics: Improve 'too short LIST' error message in wav.c.
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:09:30 +0000 (15:09 +0100)]
Do not reject LIST tags in wav with size 4.
Fixes ticket #745.
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:08:59 +0000 (15:08 +0100)]
Detect 'yuv2' as rawvideo also in avi.
Mans Rullgard [Thu, 8 Dec 2011 04:26:12 +0000 (04:26 +0000)]
rv40: NEON optimised loop filter strength selection
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 8 Dec 2011 02:50:25 +0000 (02:50 +0000)]
rv40: rearrange loop filter functions
This splits the loop filter functions into smaller, more SIMD-friendly
functions.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Mon, 12 Sep 2011 15:40:29 +0000 (17:40 +0200)]
configure: cosmetics: sort some lists where appropriate
Diego Biurrun [Wed, 14 Dec 2011 02:15:38 +0000 (03:15 +0100)]
swscale_mmx: drop no longer required parameters from VSCALEX macros
Diego Biurrun [Wed, 14 Dec 2011 02:15:37 +0000 (03:15 +0100)]
swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
Diego Biurrun [Tue, 13 Dec 2011 21:54:52 +0000 (22:54 +0100)]
build: conditionally compile x86 H.264 chroma optimizations
Clément Bœsch [Wed, 14 Dec 2011 06:29:58 +0000 (07:29 +0100)]
cosmetic: consistent spacing over the Changelog.
Michael Niedermayer [Wed, 14 Dec 2011 04:19:53 +0000 (05:19 +0100)]
fate: fix v410 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 13 Dec 2011 22:19:00 +0000 (17:19 -0500)]
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>
Derek Buitenhuis [Tue, 13 Dec 2011 19:24:56 +0000 (14:24 -0500)]
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>
Michael Niedermayer [Tue, 13 Dec 2011 23:57:34 +0000 (00:57 +0100)]
MAINTAINERS: add 0.9
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Nov 2011 19:37:42 +0000 (20:37 +0100)]
ac3dec: update checked AV_EF flags.
A user who wishes to use default error concealment cannot set the
AV_EF_CRCCHECK flag because not every CRC in every format is a
reliable indicator of bitstream damage. In some formats crcrs
can be nonsensical in absence of any damage. We thus add the
AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to
allow a user to enable this reliable CRC check without having to
enable all CRC checks in all formats.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 13 Dec 2011 19:33:48 +0000 (14:33 -0500)]
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: Diego Biurrun <diego@biurrun.de>
Derek Buitenhuis [Mon, 12 Dec 2011 18:01:12 +0000 (13:01 -0500)]
doc: make developer.texi point to correct fate doc
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Tue, 13 Dec 2011 14:55:11 +0000 (15:55 +0100)]
build: rename subdir.mak ---> library.mak
Diego Biurrun [Mon, 12 Sep 2011 11:56:06 +0000 (13:56 +0200)]
configure: do not manually enable protocols
Protocols are handled just like all other components groups such as
muxers and are automatically enabled.
Michael Niedermayer [Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ulti: Fix invalid reads
lavf: dealloc private options in av_write_trailer
yadif: support 10bit YUV
vc1: mark with ER_MB_ERROR bits overconsumption
lavc: introduce ER_MB_END and ER_MB_ERROR
error_resilience: use the ER_ namespace
build: move inclusion of subdir.mak to main subdir loop
rv34: NEON optimised 4x4 dequant
rv34: move 4x4 dequant to RV34DSPContext
aacdec: Use intfloat.h rather than local punning union.
Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 11 Dec 2011 16:37:40 +0000 (17:37 +0100)]
Support "VLB " audio in NSV files.
See samples/nsv/vlb_audio.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 13 Dec 2011 20:01:45 +0000 (21:01 +0100)]
cleanup: for(int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 19:53:21 +0000 (20:53 +0100)]
clenaup: #ifdec CONFIG*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 13 Dec 2011 14:36:34 +0000 (15:36 +0100)]
lavfi: use the new audio API in amovie source filter.
Clément Bœsch [Tue, 13 Dec 2011 14:54:59 +0000 (15:54 +0100)]
lavfi: skip the frame in case of error.
This fixes playback with some audio files through filters.
Michael Niedermayer [Tue, 13 Dec 2011 19:04:04 +0000 (20:04 +0100)]
lavc: set pkt_?ts to NOPTS in get_frame_defaults.
Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 19:01:49 +0000 (20:01 +0100)]
Fix all GNU %Ld
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 18:54:31 +0000 (19:54 +0100)]
twinnvq: remove ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 18:47:57 +0000 (19:47 +0100)]
decoding example: reset pts/dts after subpacket.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 18:46:29 +0000 (19:46 +0100)]
ffmpeg: reset dts/pts after decoding the first subpacket
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaurav Narula [Tue, 13 Dec 2011 17:41:37 +0000 (23:11 +0530)]
ulti: Fix invalid reads
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 12 Dec 2011 17:22:22 +0000 (18:22 +0100)]
lavf: dealloc private options in av_write_trailer
Fix the iformat/oformat typo.
Luca Barbato [Sun, 4 Dec 2011 14:56:41 +0000 (15:56 +0100)]
yadif: support 10bit YUV
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 27 Nov 2011 23:31:53 +0000 (00:31 +0100)]
vc1: mark with ER_MB_ERROR bits overconsumption
This patch is a generalization of what Michael Niedermayer
fixed in a single case.
The wmv8-drm fate test had been updated accordingly.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 27 Nov 2011 23:31:52 +0000 (00:31 +0100)]
lavc: introduce ER_MB_END and ER_MB_ERROR
Simplify a little error resilience calls
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 27 Nov 2011 23:31:51 +0000 (00:31 +0100)]
error_resilience: use the ER_ namespace
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Tue, 13 Dec 2011 14:45:43 +0000 (15:45 +0100)]
msrledec: Check for overreads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 14:45:04 +0000 (15:45 +0100)]
aascdec: Check input buffer size on raw data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Tue, 13 Dec 2011 13:28:01 +0000 (13:28 +0000)]
build: move inclusion of subdir.mak to main subdir loop
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 12 Dec 2011 23:22:04 +0000 (23:22 +0000)]
rv34: NEON optimised 4x4 dequant
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 12 Dec 2011 23:21:39 +0000 (23:21 +0000)]
rv34: move 4x4 dequant to RV34DSPContext
Signed-off-by: Mans Rullgard <mans@mansr.com>
Alex Converse [Mon, 12 Dec 2011 18:23:51 +0000 (10:23 -0800)]
aacdec: Use intfloat.h rather than local punning union.
Michael Niedermayer [Tue, 13 Dec 2011 02:27:19 +0000 (03:27 +0100)]
mp4enc: Avoid storing sizes in trun when they all match.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 02:11:53 +0000 (03:11 +0100)]
mp4enc: Only store flags in trun when they differ from the default and set a sane default.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 02:02:20 +0000 (03:02 +0100)]
mp4enc: dont store durations in trun if they are unneeded.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 01:55:37 +0000 (02:55 +0100)]
mp4enc: dont store cts in trun if they are unneeded.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 00:28:22 +0000 (01:28 +0100)]
lavc: use hexadecimal debug print for showing err_recognization values.
They are flags which makes them easier to read as hex than decimal.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 00:26:28 +0000 (01:26 +0100)]
msmpeg4dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 00:26:14 +0000 (01:26 +0100)]
mpeg4dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Dec 2011 00:25:08 +0000 (01:25 +0100)]
h263dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 Dec 2011 23:29:25 +0000 (00:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 Dec 2011 19:59:04 +0000 (20:59 +0100)]
build: Disable avconv more completely while leaving the user the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 7 Dec 2011 12:03:53 +0000 (13:03 +0100)]
doxygen: misc consistency, spelling and wording fixes