]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 9 Aug 2014 19:49:55 +0000 (21:49 +0200)]
Merge commit '
7acdd3a1275bcd9cad48f9632169f6bbaeb39d84 '
* commit '
7acdd3a1275bcd9cad48f9632169f6bbaeb39d84 ':
hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()
Conflicts:
libavcodec/hevc_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 19:35:11 +0000 (21:35 +0200)]
Merge commit '
52a2c17ec006282f388071a831dfb21288611253 '
* commit '
52a2c17ec006282f388071a831dfb21288611253 ':
hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()
Conflicts:
libavcodec/hevc_refs.c
See:
c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 19:17:14 +0000 (21:17 +0200)]
Merge commit '
a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4 '
* commit '
a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4 ':
hevc_filter: move some conditions out of loops
Conflicts:
libavcodec/hevc_filter.c
This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.
See:
83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 19:01:06 +0000 (21:01 +0200)]
Merge commit '
70211539a39ca3854f8a9e97d51dc27caa079943 '
* commit '
70211539a39ca3854f8a9e97d51dc27caa079943 ':
hevc: deobfuscate slice/tile boundary handling for DBF
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
See:
a5c621aa852522c79146035b2db4b89d2e096d3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 18:51:48 +0000 (20:51 +0200)]
Merge commit '
55019715785790836f60870180e1764b06e6591c '
* commit '
55019715785790836f60870180e1764b06e6591c ':
hevc_filter: drop more redundant checks
Conflicts:
libavcodec/hevc_filter.c
No change, as the removed checks where not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 18:48:53 +0000 (20:48 +0200)]
Merge commit '
65b8b6c476454d201348737527a1d9471f689278 '
* commit '
65b8b6c476454d201348737527a1d9471f689278 ':
hevc_filter: drop redundant checks
Conflicts:
libavcodec/hevc_filter.c
No change as the removed checks where not in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 18:32:38 +0000 (20:32 +0200)]
Merge commit '
4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9 '
* commit '
4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9 ':
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Conflicts:
libavcodec/hevc.c
See:
83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 9 Aug 2014 18:34:14 +0000 (20:34 +0200)]
avfilter/dctdnoiz: remove a few indirections in idcts
No change in the generated asm.
Anton Khirnov [Sun, 27 Jul 2014 19:40:20 +0000 (19:40 +0000)]
hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()
1) each of the loops run within a single CTB, so the relevant reference
list is constant
2) when that CTB is, or lies on the same slice as, the current one, we
can use a simple access instead of a relatively expensive call to
ff_hevc_get_ref_list()
Anton Khirnov [Sun, 27 Jul 2014 18:52:12 +0000 (18:52 +0000)]
hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()
It makes no sense and cannot happen in any place from which this
function is called.
Anton Khirnov [Sun, 27 Jul 2014 18:12:24 +0000 (18:12 +0000)]
hevc_filter: move some conditions out of loops
Anton Khirnov [Sun, 27 Jul 2014 17:49:09 +0000 (17:49 +0000)]
hevc: deobfuscate slice/tile boundary handling for DBF
Use named constants instead of magic numbers, avoid using variables with
inverse meaning from what their name implies.
Anton Khirnov [Sun, 27 Jul 2014 17:10:04 +0000 (17:10 +0000)]
hevc_filter: drop more redundant checks
The if() around those loops ensures this condition is always false.
Anton Khirnov [Sun, 27 Jul 2014 17:06:19 +0000 (17:06 +0000)]
hevc_filter: drop redundant checks
ff_hevc_deblocking_boundary_strengths() is never called if the
deblocking filter is disabled for the slice.
Anton Khirnov [Sun, 27 Jul 2014 17:01:53 +0000 (17:01 +0000)]
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Michael Niedermayer [Sat, 9 Aug 2014 13:30:03 +0000 (15:30 +0200)]
avformat/avio: Fix "warning: struct AVBPrint declared inside parameter list"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 10:42:07 +0000 (12:42 +0200)]
avcodec/avdct: add "xvid" alias AVOption and use FF_IDCT_XVID
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 10:11:13 +0000 (12:11 +0200)]
Merge commit '
d35b94fbabd8beb5d566c0b5d01688aff62c3b36 '
* commit '
d35b94fbabd8beb5d566c0b5d01688aff62c3b36 ':
avcodec: Rename xvidmmx IDCT to xvid
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Aug 2014 02:49:09 +0000 (04:49 +0200)]
avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation
Fixes assertion failure
Fixes Ticket3822
as a side-effect this makes some mkv files a few bytes smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Fri, 8 Aug 2014 17:37:06 +0000 (10:37 -0700)]
avformat/movenc: write reel_name metadata to tmcd atom
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 8 Aug 2014 19:19:29 +0000 (21:19 +0200)]
Autodetect jpeg-ls files.
Michael Niedermayer [Fri, 8 Aug 2014 20:00:29 +0000 (22:00 +0200)]
Merge commit '
84d173d3de97c753234ab0c0b50551d51413d663 '
* commit '
84d173d3de97c753234ab0c0b50551d51413d663 ':
xvididct: Ensure that the scantable permutation is always set correctly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)]
Merge commit '
6f1960ab71b4f18551243ce22d01913108265233 '
* commit '
6f1960ab71b4f18551243ce22d01913108265233 ':
idct: cosmetics: Drop one unnecessary if-block level
Conflicts:
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Aug 2014 19:38:32 +0000 (21:38 +0200)]
Merge commit '
444c73583d2848a542330c03949e1f933ac68f53 '
* commit '
444c73583d2848a542330c03949e1f933ac68f53 ':
configure: Only run gas checks on ARM and PowerPC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Aug 2014 19:38:12 +0000 (21:38 +0200)]
Merge commit '
0026e356d044e72b6e743b234708b8b8af457ac0 '
* commit '
0026e356d044e72b6e743b234708b8b8af457ac0 ':
configure: Die if gas is unavailable under aarch64 as well as ARM
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Aug 2014 19:31:54 +0000 (21:31 +0200)]
Merge commit '
e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472 '
* commit '
e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472 ':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Aug 2014 19:25:32 +0000 (21:25 +0200)]
Merge commit '
454697603e4efdfc04fadec40518d56c7dc1e5dd '
* commit '
454697603e4efdfc04fadec40518d56c7dc1e5dd ':
mpegts: Use av_free() to free memory allocated by av_strdup()
Conflicts:
libavformat/mpegtsenc.c
See:
92deb28945a5f2b58908d383f183cfc1bc1d7fae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Jacobs [Thu, 7 Aug 2014 00:04:38 +0000 (20:04 -0400)]
avformat/matroskadec: Check avpriv_new_chapter() for failure
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 6 Aug 2014 13:19:15 +0000 (06:19 -0700)]
avcodec: Rename xvidmmx IDCT to xvid
The Xvid IDCT is not MMX-specific.
Diego Biurrun [Fri, 8 Aug 2014 10:10:05 +0000 (03:10 -0700)]
xvididct: Ensure that the scantable permutation is always set correctly
This fixes cases where the scantable permuation would get overwritten by
the general idctdsp initialization.
Diego Biurrun [Thu, 7 Aug 2014 22:04:39 +0000 (15:04 -0700)]
idct: cosmetics: Drop one unnecessary if-block level
Clément Bœsch [Fri, 8 Aug 2014 17:59:15 +0000 (19:59 +0200)]
avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs
This makes the code about 1.5x faster without any noticeable difference
in the output.
Clément Bœsch [Fri, 8 Aug 2014 17:46:49 +0000 (19:46 +0200)]
avfilter/dctdnoiz: remove forward declarations after previous commit
Clément Bœsch [Fri, 8 Aug 2014 17:44:40 +0000 (19:44 +0200)]
avfilter/dctdnoiz: make color [de]correlation less clumsy
This has no impact on overall performance, since the block DCT taking
most of the time anyway.
Muhammad Faiz [Fri, 8 Aug 2014 14:58:35 +0000 (21:58 +0700)]
avfilter/showcqt: add and extend tlength and volume options
Add a tlength option with frequency and timeclamp variable
Add to the volume option support for frequency and timeclamp variable,
a_weighting, b_weighting and c_weighting functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marek Fort [Thu, 7 Aug 2014 12:27:19 +0000 (14:27 +0200)]
avformat/mov: Support reading Avid's metadata for DNXHD codec.
The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 8 Aug 2014 14:14:18 +0000 (16:14 +0200)]
Autodetect webp files.
Carl Eugen Hoyos [Fri, 8 Aug 2014 14:06:10 +0000 (16:06 +0200)]
configure: Check if libwebp compilation will succeed.
Diego Biurrun [Wed, 6 Aug 2014 12:55:33 +0000 (05:55 -0700)]
configure: Only run gas checks on ARM and PowerPC
Standalone GNU assembly is not used on x86.
Diego Biurrun [Wed, 6 Aug 2014 12:38:43 +0000 (05:38 -0700)]
configure: Die if gas is unavailable under aarch64 as well as ARM
Luca Barbato [Wed, 6 Aug 2014 03:01:15 +0000 (05:01 +0200)]
mpeg: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Fri, 8 Aug 2014 09:46:21 +0000 (02:46 -0700)]
mpegts: Use av_free() to free memory allocated by av_strdup()
James Almer [Thu, 7 Aug 2014 20:12:41 +0000 (17:12 -0300)]
replace calls to url_feof() with avio_feof()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 20:12:40 +0000 (17:12 -0300)]
lavf/avio: rename url_feof() to avio_feof()
It's a public function and should use the avio_ namespace
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Thu, 7 Aug 2014 17:20:36 +0000 (10:20 -0700)]
avformat/mov: read reel_name metadata from tmcd atom
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 21:04:32 +0000 (23:04 +0200)]
avformat/mpegtsenc: Use av_freep() for pids
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 20:41:29 +0000 (22:41 +0200)]
avformat/mpegtsenc: Free services array completely on failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 20:40:24 +0000 (22:40 +0200)]
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 20:28:59 +0000 (22:28 +0200)]
mpegtsenc: Check dynarray_add() for failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 20:23:00 +0000 (22:23 +0200)]
avformat/mpegtsenc: use the correct deallocation functions
Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 20:11:37 +0000 (22:11 +0200)]
Merge commit '
5b220e1e19c17b202d83d9be0868d152109ae8f0 '
* commit '
5b220e1e19c17b202d83d9be0868d152109ae8f0 ':
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 19:59:15 +0000 (21:59 +0200)]
Merge commit '
f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc '
* commit '
f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc ':
mpegts: Avoid unnecessary variable shadowing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 19:42:30 +0000 (21:42 +0200)]
Merge commit '
6d6bd3a3db24747ae5e10716f4782129c38951f6 '
* commit '
6d6bd3a3db24747ae5e10716f4782129c38951f6 ':
mpegts: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 7 Aug 2014 19:21:03 +0000 (21:21 +0200)]
avfilter/dctdnoiz: add 8x8 dct and make it the default
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
Michael Niedermayer [Thu, 7 Aug 2014 19:16:06 +0000 (21:16 +0200)]
Merge commit '
b7b1bf9166ac3102c401295fdd5d4933c512aa50 '
* commit '
b7b1bf9166ac3102c401295fdd5d4933c512aa50 ':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 18:59:19 +0000 (20:59 +0200)]
doc/APIchanges: Correct function reference.
The commit
bb789016d423d2cfacd2904ac66257bdf7f0964e
un-deprecated sws_getContext()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)]
Merge commit '
bb789016d423d2cfacd2904ac66257bdf7f0964e '
* commit '
bb789016d423d2cfacd2904ac66257bdf7f0964e ':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 18:43:11 +0000 (20:43 +0200)]
Merge commit '
ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d '
* commit '
ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d ':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 18:21:56 +0000 (20:21 +0200)]
Merge commit '
a7e541c9926d531a100ba0d36f4e56956dd84651 '
* commit '
a7e541c9926d531a100ba0d36f4e56956dd84651 ':
h264: fix interpretation of interleved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marek Fort [Wed, 6 Aug 2014 14:48:21 +0000 (16:48 +0200)]
avformat/movenc: XMP metadata support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marek Fort [Wed, 6 Aug 2014 14:48:21 +0000 (16:48 +0200)]
avformat/mov: XMP metadata suppor.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 28 Jun 2014 18:35:27 +0000 (20:35 +0200)]
avfilter/dctdnoiz: rewrite [f/i]dct
This removes the avcodec dependency and make the code almost twice as
fast. More to come.
The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
Diego Biurrun [Wed, 6 Aug 2014 11:08:50 +0000 (04:08 -0700)]
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Diego Biurrun [Wed, 6 Aug 2014 10:28:06 +0000 (03:28 -0700)]
mpegts: Avoid unnecessary variable shadowing
Diego Biurrun [Wed, 6 Aug 2014 11:39:24 +0000 (04:39 -0700)]
mpegts: Drop some unnecessary parentheses
Diego Biurrun [Wed, 6 Aug 2014 01:02:18 +0000 (18:02 -0700)]
mpegts: K&R formatting cosmetics
Michael Niedermayer [Tue, 5 Aug 2014 14:15:22 +0000 (16:15 +0200)]
avdevice/lavfi: Simplify non-AV stream check
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 12:42:35 +0000 (14:42 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 05:12:46 +0000 (02:12 -0300)]
lavf: remove nonexistent functions from the version file
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 05:12:45 +0000 (02:12 -0300)]
lavc: remove nonexistent functions from the version file
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 7 Aug 2014 11:16:38 +0000 (13:16 +0200)]
Do not automatically map subtitles if the decoder and encoder properties are different.
Fixes ticket #3819.
James Almer [Thu, 7 Aug 2014 03:43:03 +0000 (00:43 -0300)]
lavd/dshow: use av_codec_get_id()
ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 4 Aug 2014 17:34:30 +0000 (10:34 -0700)]
swscale: Undeprecate sws_getContext()
sws_getCachedContext is not a full replacement for the function.
Diego Biurrun [Mon, 4 Aug 2014 17:28:10 +0000 (10:28 -0700)]
avcodec: Undeprecate reordered_opaque
It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts. There is no way to cleanly achieve this
without the field.
James Almer [Thu, 7 Aug 2014 04:22:48 +0000 (01:22 -0300)]
avcodec/raw: add avpriv_get_raw_pix_fmt_tags()
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Felix Abecassis [Thu, 7 Aug 2014 09:42:36 +0000 (11:42 +0200)]
h264: fix interpretation of interleved stereo modes
Column and row frame packing arrangements were inverted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Thu, 7 Aug 2014 10:16:49 +0000 (12:16 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 7 Aug 2014 07:55:40 +0000 (09:55 +0200)]
lavf/mpegts: Do not return the result of a (void) function from a void function.
Fixes compilation with Sun C 5.10.
Carl Eugen Hoyos [Thu, 7 Aug 2014 07:12:34 +0000 (09:12 +0200)]
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821.
James Almer [Wed, 6 Aug 2014 23:59:56 +0000 (20:59 -0300)]
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:53:30 +0000 (02:53 +0200)]
Merge commit '
b50173a4dd47b9c3c89845b781fa958ccf860929 '
* commit '
b50173a4dd47b9c3c89845b781fa958ccf860929 ':
movenc: fix QT chapter track character encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:42:15 +0000 (02:42 +0200)]
Merge commit '
da9cc22d5bd5f59756c2037b02966376da2cf323 '
* commit '
da9cc22d5bd5f59756c2037b02966376da2cf323 ':
movenc: add track title to tracks
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:35:39 +0000 (02:35 +0200)]
Merge commit '
d9432789bd119f0e37bcf65cebda05d36aafd4ed '
* commit '
d9432789bd119f0e37bcf65cebda05d36aafd4ed ':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:27:07 +0000 (02:27 +0200)]
avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"
Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:06:45 +0000 (02:06 +0200)]
Merge commit '
7b588bb691644e1b3c168b99accf74248a24e3cf '
* commit '
7b588bb691644e1b3c168b99accf74248a24e3cf ':
svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 23:56:28 +0000 (01:56 +0200)]
Merge commit '
c7d9b473e28238d4a4ef1b7e8b42c1cca256da36 '
* commit '
c7d9b473e28238d4a4ef1b7e8b42c1cca256da36 ':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 23:29:42 +0000 (01:29 +0200)]
Merge commit '
a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812 '
* commit '
a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812 ':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See:
ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 6 Aug 2014 22:07:59 +0000 (19:07 -0300)]
libavcodec/rawdec: remove old ff_find_pix_fmt() function
It's been dead code for more than a year
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 19:21:53 +0000 (21:21 +0200)]
avformat/dtsdec: check more of the dca headers in dts_probe()
Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 19:29:36 +0000 (21:29 +0200)]
avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Thu, 31 Jul 2014 18:51:40 +0000 (11:51 -0700)]
movenc: fix QT chapter track character encoding
An encoding ("encd") box is required to tell QT that the string is UTF8
John Stebbins [Thu, 31 Jul 2014 17:00:05 +0000 (10:00 -0700)]
movenc: add track title to tracks
John Stebbins [Wed, 6 Aug 2014 14:42:18 +0000 (07:42 -0700)]
movenc: remove pointless loop around BITEXACT test
Anton Khirnov [Sun, 3 Aug 2014 08:14:48 +0000 (10:14 +0200)]
svq1: do not modify the input packet
The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.
Also, check the size of the header, avoiding invalid reads on truncated
data.
CC:libav-stable@libav.org
Michael Niedermayer [Wed, 6 Aug 2014 18:35:53 +0000 (20:35 +0200)]
Merge commit '
ed6d9ce914d552eeda16af857da97c4b1aea1e3f '
* commit '
ed6d9ce914d552eeda16af857da97c4b1aea1e3f ':
configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 6 Aug 2014 10:56:34 +0000 (10:56 +0000)]
cdgraphics: do not return 0 from the decode function
0 means no data consumed, so it can trigger an infinite loop in the
caller.
CC:libav-stable@libav.org
Anton Khirnov [Wed, 6 Aug 2014 10:46:50 +0000 (10:46 +0000)]
cdgraphics: switch to bytestream2
Fixes possible invalid memory accesses on corrupted data.
CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674
Michael Niedermayer [Wed, 6 Aug 2014 18:27:52 +0000 (20:27 +0200)]
Merge commit '
cbc808d726afdf53d866264722785c1304c17390 '
* commit '
cbc808d726afdf53d866264722785c1304c17390 ':
jpeg2000: enable 4 component pixel formats
See:
f0358dc1d30cd4f4862489ab95c4d408b00a8b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:43 +0000 (07:43 +0000)]
x86: sbrdsp/fft: reuse ps_neg constant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:42 +0000 (07:43 +0000)]
x86: diracdsp: reuse constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>