OSDN Git Service
Michael Niedermayer [Tue, 19 Mar 2013 14:09:10 +0000 (15:09 +0100)]
avformat/tee: add forgotten ret assignment
Fixes CID991840
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Mar 2013 13:43:47 +0000 (14:43 +0100)]
hpeldsp: Increase put_no_rnd_pixels_tab[][] size
Fixes CID991852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 15 Mar 2013 01:52:30 +0000 (02:52 +0100)]
fate: add ebur128 metadata test.
Michael Niedermayer [Tue, 19 Mar 2013 13:19:29 +0000 (14:19 +0100)]
audio_get_buffer: add assert to ensure nb_extended_buf has a safe value
May silence CID991853
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Mar 2013 13:07:39 +0000 (14:07 +0100)]
matroska_parse_frame: fix memleak
Fixes CID991856
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 16 Mar 2013 23:27:00 +0000 (00:27 +0100)]
lavf: do not make a hard dep on internal subtitles helpers.
Michael Niedermayer [Tue, 19 Mar 2013 12:44:53 +0000 (13:44 +0100)]
mpegvideo_enc: remove stray semicolon
Fixes CID991857
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Mar 2013 12:35:10 +0000 (13:35 +0100)]
avutil/add_to_pool: remove unused assgnment
Fixed CID991859
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
chinshou [Tue, 19 Mar 2013 12:27:53 +0000 (13:27 +0100)]
alac: Fix order of values in comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Mar 2013 12:06:08 +0000 (13:06 +0100)]
avidec: fix duration and bitrate of truncated files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 19 Mar 2013 09:37:33 +0000 (09:37 +0000)]
ffplay: silence warning of mixed enumeration types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Matthieu Bouron [Sat, 16 Feb 2013 12:52:29 +0000 (13:52 +0100)]
lavf/mxfdec: read field dominance flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 17 Mar 2013 09:59:39 +0000 (10:59 +0100)]
pthread: update all get_buffer checks for get_buffer2
This restores the performance of simple frame-threaded codecs back to
their pre-merge levels.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 19 Mar 2013 01:11:39 +0000 (02:11 +0100)]
Fix Makefile dependency for the dvd_nav parser.
Fixes compilation for --disable-everything --enable-parser=dvd_nav
Carl Eugen Hoyos [Mon, 18 Mar 2013 23:43:01 +0000 (00:43 +0100)]
Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.
Michael Niedermayer [Mon, 18 Mar 2013 23:47:00 +0000 (00:47 +0100)]
AVFrame.pkt_dts: improve docs
Related to Ticket2375
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 18:06:45 +0000 (19:06 +0100)]
segment: copy metadata
Fixes Ticket2230
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thierry Foucu [Mon, 18 Mar 2013 21:00:23 +0000 (14:00 -0700)]
Fix termination of mov_ch_layouts_wav array lookup
Problem found using ASAN.
In some case, the ff_mov_get_channel_layout_tag function will not find 0
as termination for lookup in the array mov_ch_layouts_wav.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 22:17:16 +0000 (23:17 +0100)]
doc: Document the order in which avoid_negative_ts is applied compared to other timestamp options
Also try to document the rational behind it.
This might fix Ticket2376
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 22:08:56 +0000 (23:08 +0100)]
doc: try to improve avoid_negative_ts documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 17 Mar 2013 01:30:10 +0000 (02:30 +0100)]
lavc: fix avpacket memleak with subtitles recoding.
dronus [Sun, 10 Mar 2013 15:29:04 +0000 (16:29 +0100)]
libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode
Elvis Presley [Mon, 18 Mar 2013 18:34:41 +0000 (19:34 +0100)]
libavcodec/proresdec.h: fix license header
This was somehow missed when relicensing the decoder to LGPL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 17:36:16 +0000 (18:36 +0100)]
avutil/buffer: Fix race in pool.
This race will always happen sooner or later in a multi-threaded
environment and it will over time lead to OOM.
This fix works by spinning, there are other ways by which this
can be fixed, like simply detecting the issue after it happened
and freeing the over-allocated memory or simply using a mutex.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 16:53:02 +0000 (17:53 +0100)]
append_packet_chunked: remove outcommented code
our variant works fine and should be better
also remove related unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 16:48:52 +0000 (17:48 +0100)]
mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 16:43:43 +0000 (17:43 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
print_options: do not generate docs for options without enc or dec flags
mpeg12: do not fail on zero dimensions in the sequence header.
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 16:30:53 +0000 (17:30 +0100)]
Merge commit '
50c449ac24fbb4c03c15d2e2026cef2204b80385'
* commit '
50c449ac24fbb4c03c15d2e2026cef2204b80385':
iff: validate CMAP palette size
asfenc: return error on negative timestamp
Conflicts:
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 22 Feb 2013 22:01:54 +0000 (23:01 +0100)]
print_options: do not generate docs for options without enc or dec flags
Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.
Anton Khirnov [Sat, 16 Mar 2013 12:08:32 +0000 (13:08 +0100)]
mpeg12: do not fail on zero dimensions in the sequence header.
The total frame size is a combination of the 12 bits in the sequence
header and 2 more bits in the the sequence extension. While the
specification explicitly forbids the dimensions from the sequence header
from being 0 (thus ruling out multiples of 4096), such videos
apparrently exist in the wild so we should attempt to decode them.
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
Fixes Bug 416.
Kostya Shishkov [Sun, 17 Mar 2013 19:22:19 +0000 (20:22 +0100)]
iff: validate CMAP palette size
Fixes CVE-2013-2495
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
Luca Barbato [Sun, 17 Mar 2013 14:13:43 +0000 (15:13 +0100)]
asfenc: return error on negative timestamp
According to the specification the timestamp is represented by a 32bit
unsigned.
CC: libav-stable@libav.org
Clément Bœsch [Mon, 18 Mar 2013 08:04:11 +0000 (09:04 +0100)]
lavc,lavu: fix two doxy mixup between h/v chroma shift.
Clément Bœsch [Mon, 18 Mar 2013 07:51:55 +0000 (08:51 +0100)]
lavfi/pad: fix horizontal/vertical shift confusion.
Michael Niedermayer [Mon, 18 Mar 2013 03:47:27 +0000 (04:47 +0100)]
avutil/frame: typo
found by ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 02:20:16 +0000 (03:20 +0100)]
avutil/frame: document alignment and padding requirements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 15 Mar 2013 01:52:12 +0000 (02:52 +0100)]
lavfi/ebur128: add metadata injection.
Michael Niedermayer [Mon, 18 Mar 2013 01:10:10 +0000 (02:10 +0100)]
aasc: fix pointer vs value error
Fixes Ticket2365
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Mar 2013 01:00:57 +0000 (02:00 +0100)]
buffersrc: fix w/h error
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 23:00:02 +0000 (00:00 +0100)]
rmdec: flush audio packet on seeking
Fixes Ticket1605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 21:52:20 +0000 (22:52 +0100)]
doc/developer: Add "security fixes" to the release process steps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 20:55:20 +0000 (21:55 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
fate: add a test for -filter_complex / -lavfi without input.
ffmpeg: make -lavfi an alias for -filter_complex.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 15:51:40 +0000 (16:51 +0100)]
avutil/get_pool: remove dead operations whichs result is never used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 15:37:06 +0000 (16:37 +0100)]
avutil/get_pool: Remove redundant initial atomic operation
602->442 dezicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 17 Mar 2013 12:32:57 +0000 (13:32 +0100)]
fate: add a test for -filter_complex / -lavfi without input.
Nicolas George [Sat, 16 Mar 2013 16:08:33 +0000 (17:08 +0100)]
ffmpeg: make -lavfi an alias for -filter_complex.
Richard [Sun, 17 Mar 2013 09:21:12 +0000 (10:21 +0100)]
mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs.
The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV.
The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 13:30:26 +0000 (14:30 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/buffersink: fix header.
lavfi/buffersrc: disable deprecated warnings.
lavfi/buffersrc: check channel count changes.
lavfi/buffersrc: set channel layout if it is known.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 13:15:15 +0000 (14:15 +0100)]
h264_refs: fix typo in refs fallback check
Fixes regression since
01a0283
Fixes Ticket2371
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 17 Mar 2013 00:08:51 +0000 (01:08 +0100)]
lavfi/swapuv: remove deprecated base field use
Stefano Sabatini [Sun, 17 Mar 2013 10:37:50 +0000 (11:37 +0100)]
ffplay: remove options skiploop, skipidct, skipframe
The corresponding codec options (skip_loop, skip_idct, skip_frame) can be
set in a more flexible way.
This technically causes a user interface break, but since the options
were not even documented and we just released a major version that should
not be a serious issue.
Stefano Sabatini [Sun, 17 Mar 2013 10:33:17 +0000 (11:33 +0100)]
ffplay: remove unused variable "codec"
Fix warning:
ffplay.c: In function ‘video_thread’:
ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]
Michael Niedermayer [Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 11:32:07 +0000 (12:32 +0100)]
Merge commit '
23f4c5acc438366d84cacf49e33b0bcd72f04937'
* commit '
23f4c5acc438366d84cacf49e33b0bcd72f04937':
document the release process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 16 Mar 2013 16:57:04 +0000 (17:57 +0100)]
lavfi/buffersink: fix header.
Move non-obsolete functions, structures and constants outside
the scope of "#if FF_API_AVFILTERBUFFER".
Add attribute_deprecated to av_buffersink_get_buffer_ref()
and av_buffersink_poll_frame().
Add doxygen for av_buffersink_get_frame_flags().
Nicolas George [Sat, 16 Mar 2013 16:46:55 +0000 (17:46 +0100)]
lavfi/buffersrc: disable deprecated warnings.
Nicolas George [Sat, 16 Mar 2013 16:45:22 +0000 (17:45 +0100)]
lavfi/buffersrc: check channel count changes.
Paul B Mahol [Sun, 17 Mar 2013 11:10:26 +0000 (11:10 +0000)]
sndio_dec: add missing #include for av_gettime()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Thu, 14 Mar 2013 18:52:59 +0000 (19:52 +0100)]
lavfi/buffersrc: set channel layout if it is known.
Introduced in
01649c7, lost in the API change.
Anton Khirnov [Sat, 16 Mar 2013 17:09:17 +0000 (18:09 +0100)]
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
Michael Niedermayer [Sun, 17 Mar 2013 04:24:35 +0000 (05:24 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add -af option
ffplay: use refcounted frames for audio
ffplay: use frame->pts if available for setting the audio clock
ffplay: restructure audio stream opening code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Mar 2013 04:20:02 +0000 (05:20 +0100)]
h264_qpel: fix another forgotten int stride
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 17 Mar 2013 02:44:14 +0000 (03:44 +0100)]
lavc: remove unecessary a64enc include.
Marton Balint [Mon, 25 Feb 2013 21:00:30 +0000 (22:00 +0100)]
ffplay: add -af option
Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 13 Mar 2013 00:26:21 +0000 (01:26 +0100)]
ffplay: use refcounted frames for audio
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 2 Mar 2013 19:21:52 +0000 (20:21 +0100)]
ffplay: use frame->pts if available for setting the audio clock
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 2 Mar 2013 13:38:23 +0000 (14:38 +0100)]
ffplay: restructure audio stream opening code
Preparation for -af support.
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Sun, 17 Mar 2013 01:57:43 +0000 (02:57 +0100)]
lavfi/alphaextract: fix frame memleak.
Michael Niedermayer [Sun, 17 Mar 2013 01:18:08 +0000 (02:18 +0100)]
avutil/frame: fix video buffer allocation
The padding was lost during porting from avcodec
Should fix out of array accesses
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 17 Mar 2013 01:02:59 +0000 (02:02 +0100)]
tests/filter-metadata-scenedetect: update reference
Fix reference after
f7ab23b0d0a8b72a62bd9386a1e48ccc2cf47576.
+10l to me, this time aliens are not involved.
Stefano Sabatini [Sun, 17 Mar 2013 00:56:53 +0000 (01:56 +0100)]
tests/eval: fix reference after
b2098d2417a085d33d99738dd7f963c7b260a0bf
+10l to me, I blame the aliens.
Clément Bœsch [Sun, 17 Mar 2013 00:46:22 +0000 (01:46 +0100)]
lavfi/thumbnail: replace frame unref with free.
Fixes memleak spotted by FATE.
Stefano Sabatini [Sat, 16 Mar 2013 00:22:45 +0000 (01:22 +0100)]
ffprobe: remove deprecated frame "reference" field
Stefano Sabatini [Fri, 15 Mar 2013 23:29:55 +0000 (00:29 +0100)]
lavfi/settb: add support for named options
Stefano Sabatini [Fri, 15 Mar 2013 23:07:15 +0000 (00:07 +0100)]
lavfi/blackframe: add support for named options
Stefano Sabatini [Wed, 13 Mar 2013 21:36:06 +0000 (22:36 +0100)]
doc/filters: add bit-slicing example in lutyuv docs
Stefano Sabatini [Wed, 13 Mar 2013 13:09:10 +0000 (14:09 +0100)]
lavu/eval: add bitor and bitand functions
Warning note suggested by Reimar.
Hendrik Leppkes [Fri, 15 Mar 2013 19:44:57 +0000 (20:44 +0100)]
lavfi: let gcc realign the stack on public graph driving functions
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC application.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 16 Mar 2013 22:37:58 +0000 (23:37 +0100)]
lavfi/delogo: 10l forgotten trailing NULL in shorthand.
Regression since
de3e0ab3.
James Darnley [Sat, 16 Mar 2013 20:42:27 +0000 (21:42 +0100)]
yadif: remove an 'm' from the LOAD macro definition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Sat, 16 Mar 2013 20:42:26 +0000 (21:42 +0100)]
yadif: remove repeated check on width
The filter already checks that width (and height) are greater than 3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Sat, 16 Mar 2013 20:42:25 +0000 (21:42 +0100)]
yadif: cosmetic indentation from previous commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Sat, 16 Mar 2013 20:42:24 +0000 (21:42 +0100)]
yadif: x86 assembly for 9 to 14-bit samples
These smaller samples do not need to be unpacked to double words
allowing the code to process more pixels every iteration (still 2 in MMX
but 6 in SSE2). It also avoids emulating the missing double word
instructions on older instruction sets.
Like with the previous code for 16-bit samples this has been tested on
an Athlon64 and a Core2Quad.
Athlon64:
1809275 decicycles in C, 32718 runs, 50 skips
911675 decicycles in mmx, 32727 runs, 41 skips, 2.0x faster
495284 decicycles in sse2, 32747 runs, 21 skips, 3.7x faster
Core2Quad:
921363 decicycles in C, 32756 runs, 12 skips
486537 decicycles in mmx, 32764 runs, 4 skips, 1.9x faster
293296 decicycles in sse2, 32759 runs, 9 skips, 3.1x faster
284910 decicycles in ssse3, 32759 runs, 9 skips, 3.2x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Sat, 16 Mar 2013 20:42:23 +0000 (21:42 +0100)]
yadif: x86 assembly for 16-bit samples
This is a fairly dumb copy of the assembly for 8-bit samples but it
works and produces identical output to the C version. The options have
been tested on an Athlon64 and a Core2Quad.
Athlon64:
1810385 decicycles in C, 32726 runs, 42 skips
1080744 decicycles in mmx, 32744 runs, 24 skips, 1.7x faster
818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster
Core2Quad:
924025 decicycles in C, 32750 runs, 18 skips
623995 decicycles in mmx, 32767 runs, 1 skips, 1.5x faster
406223 decicycles in sse2, 32764 runs, 4 skips, 2.3x faster
387842 decicycles in ssse3, 32767 runs, 1 skips, 2.4x faster
307726 decicycles in sse4, 32763 runs, 5 skips, 3.0x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 16 Mar 2013 19:13:44 +0000 (20:13 +0100)]
Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.
Reconfiguring can break x264 lossless encoding.
Fixes ticket #2165.
Reinhard Tartler [Sun, 24 Feb 2013 18:11:07 +0000 (19:11 +0100)]
document the release process
Nicolas George [Sat, 16 Mar 2013 10:05:45 +0000 (11:05 +0100)]
ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:27 +0000 (21:01 +0100)]
lavfi/avcodec: deprecate remainders of the avcodec glue code
Since lavfi works natively with AVFrame now, these functions are no longer
necessary and can be removed in a future bump.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 16:03:41 +0000 (17:03 +0100)]
append_packet_chunked: Remove unused initialization.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 15:58:41 +0000 (16:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_join: do not leak input frames.
asrc_anullsrc: return EOF, not -1
Conflicts:
libavfilter/asrc_anullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 15:56:30 +0000 (16:56 +0100)]
Merge commit '
f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
* commit '
f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
asrc_anullsrc: do not set samplerate and channel layout explicitly
Conflicts:
libavfilter/asrc_anullsrc.c
No change to FFmpeg due to semantic difference between the filter sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 15:38:11 +0000 (16:38 +0100)]
Merge commit '
e4a7b2177d14678ae240edcabaacfe2b14619b7b'
* commit '
e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 15:27:47 +0000 (16:27 +0100)]
Merge commit '
9676b9a2cdc4a90611188fc48d8d388e427997c5'
* commit '
9676b9a2cdc4a90611188fc48d8d388e427997c5':
AVOption: remove an unused function parameter.
filters.texi: restore mistakenly removed section name for noformat
avfiltergraph: use sizeof(var) instead of sizeof(type)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 16 Mar 2013 15:22:56 +0000 (16:22 +0100)]
fate: test both direct and indirect paths in delogo filter.
Clément Bœsch [Sat, 16 Mar 2013 15:17:37 +0000 (16:17 +0100)]
fate: test both direct and indirect paths in hue filter.
Michael Niedermayer [Sat, 16 Mar 2013 15:09:37 +0000 (16:09 +0100)]
Merge commit '
42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
* commit '
42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 14 Mar 2013 20:59:42 +0000 (21:59 +0100)]
fate: test both direct and indirect paths in hqdn3d and gradfun.
Clément Bœsch [Wed, 13 Mar 2013 04:59:20 +0000 (05:59 +0100)]
lavfi: add perms and aperms filters.
Michael Niedermayer [Sat, 16 Mar 2013 14:50:43 +0000 (15:50 +0100)]
Merge commit '
556aab8f11b045a21182eee32413aa78d5c8539b'
* commit '
556aab8f11b045a21182eee32413aa78d5c8539b':
lavfi: use designated initializers in avfilter_class
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Mar 2013 14:12:21 +0000 (15:12 +0100)]
Merge commit '
aa3c77998404cc32233cb76e961ca27db8565459'
* commit '
aa3c77998404cc32233cb76e961ca27db8565459':
lavf: sanity check size in av_get/append_packet().
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>