]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 6 Dec 2013 12:23:17 +0000 (13:23 +0100)]
avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 11:21:31 +0000 (12:21 +0100)]
Merge commit '
24abd806ea0cfb0d988d2f0044eac79cff12918c '
* commit '
24abd806ea0cfb0d988d2f0044eac79cff12918c ':
ljpegenc: deMpegEncContextize
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
tests/ref/vsynth/vsynth1-ljpeg
tests/ref/vsynth/vsynth2-ljpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:56:16 +0000 (11:56 +0100)]
avcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing()
This avoids a use of MpegEncContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:55:23 +0000 (11:55 +0100)]
avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:49:53 +0000 (11:49 +0100)]
avcodec/mjpegenc: make escape_FF() non static
This will be used by ljpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:49:17 +0000 (11:49 +0100)]
avcodec/ljpegenc: fix mem allocation failure return code encode_picture_lossless()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)]
Merge commit '
86eb2eaac629909d6ee4067c6f1e485a4e70473d '
* commit '
86eb2eaac629909d6ee4067c6f1e485a4e70473d ':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
Conflicts:
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:33:07 +0000 (11:33 +0100)]
Merge commit '
3360ad995530ea6967b1e83981b4aa8240fbb0ed '
* commit '
3360ad995530ea6967b1e83981b4aa8240fbb0ed ':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 10:04:27 +0000 (11:04 +0100)]
Merge commit '
058d5f2feb730846f22c1812e433f92f670ad751 '
* commit '
058d5f2feb730846f22c1812e433f92f670ad751 ':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()
Conflicts:
libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 6 Dec 2013 09:33:55 +0000 (10:33 +0100)]
lavfi: rename asrc_aevalsrc.c to aeval.c
The file now contains both source and filter, the new name looks more
appropriate.
Stefano Sabatini [Thu, 5 Dec 2013 17:23:06 +0000 (18:23 +0100)]
lavfi: add aeval filter
Stefano Sabatini [Fri, 6 Dec 2013 09:26:11 +0000 (10:26 +0100)]
lavfi/aevalsrc: duplicate last expression for the missing channels
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies
Replace the inline awk script with a Perl script which tracks the
dependencies recursively.
This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).
This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.
This is a variant of commit
628ceac6526724d35cb390cc1f88344f4ea22eb4
which was reverted due to out-of-tree build failure.
Michael Niedermayer [Fri, 6 Dec 2013 09:14:15 +0000 (10:14 +0100)]
Merge commit '
6d70639c7d5fe762c5f18de574eafa817fb53ef7 '
* commit '
6d70639c7d5fe762c5f18de574eafa817fb53ef7 ':
mjpegenc: do not pass MpegEncContext to jpeg_table_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 09:06:43 +0000 (10:06 +0100)]
Merge commit '
e1eaaec765d2e726618633fcbd2e06fded7647a8 '
* commit '
e1eaaec765d2e726618633fcbd2e06fded7647a8 ':
mjpegenc: remove commented out never-to-be-finished WIP cruft
Conflicts:
libavcodec/mjpegenc.c
The unfinished 2-matrix code is left in place and not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 03:31:10 +0000 (04:31 +0100)]
Merge commit '
ff506c75b71d7aaa1062b49043e0b881b1e263e9 '
* commit '
ff506c75b71d7aaa1062b49043e0b881b1e263e9 ':
mjpegenc: do not pass MpegEncContext to put_huffman_table()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)]
Merge commit '
a1ba1f20b350cb89e645f17bdb237d027170db33 '
* commit '
a1ba1f20b350cb89e645f17bdb237d027170db33 ':
mjpegenc: cosmetics, reformat jpeg_put_comments()
Conflicts:
libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 03:18:02 +0000 (04:18 +0100)]
Merge commit '
0812f5a40a0a190172b6de6e91755b882472ddc5 '
* commit '
0812f5a40a0a190172b6de6e91755b882472ddc5 ':
mjpegenc: write the JFIF header if the sample aspect ratio is set
Conflicts:
libavcodec/mjpegenc.c
See:
f3ce748d3453a490f32a5518f9cf6bef6892a30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)]
Merge commit '
66499f34b56fc6a9fdef25543bd9d576fc787895 '
* commit '
66499f34b56fc6a9fdef25543bd9d576fc787895 ':
mpegvideo: do not set current_picture_ptr in decoders
Conflicts:
libavcodec/mss2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 03:03:05 +0000 (04:03 +0100)]
Merge commit '
58a868968df445068a143f327ced03b6a02baf0d '
* commit '
58a868968df445068a143f327ced03b6a02baf0d ':
FATE: drop the last partial frame in the wmv8-drm test
Conflicts:
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:55:12 +0000 (03:55 +0100)]
Merge commit '
ac1fc92ea410c396594fcd79f5d4491fe6a8cc90 '
* commit '
ac1fc92ea410c396594fcd79f5d4491fe6a8cc90 ':
vc1dec: move setting repeat_pict after frame_start() has been called.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:46:42 +0000 (03:46 +0100)]
Merge commit '
282c6a1a0ef3e8c8e180c15b39cfe5b89704d848 '
* commit '
282c6a1a0ef3e8c8e180c15b39cfe5b89704d848 ':
mpegvideo: make ff_release_unused_pictures() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:19:37 +0000 (03:19 +0100)]
Merge commit '
c99307caee01441cfde24f3b7b0db3037b7022dc '
* commit '
c99307caee01441cfde24f3b7b0db3037b7022dc ':
mpegvideo: make frame_size_alloc() static.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:04:32 +0000 (03:04 +0100)]
Merge commit '
0b0a7a751de02464a33717e70352f696372ba1c4 '
* commit '
0b0a7a751de02464a33717e70352f696372ba1c4 ':
mpegvideo: move encode-only parts of common_end() to encode_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:54:45 +0000 (02:54 +0100)]
Merge commit '
d0d111d0592bfd6b2b8bcd2321986c0fc493455d '
* commit '
d0d111d0592bfd6b2b8bcd2321986c0fc493455d ':
mpegvideo: remove commented out cruft from ff_MPV_frame_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:38:30 +0000 (02:38 +0100)]
avcodec/mpegvideo_enc: fix linesizes in frame_end()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:37:51 +0000 (02:37 +0100)]
Merge commit '
381a722562bcc0b623acf6a00a583fe989bcb72a '
* commit '
381a722562bcc0b623acf6a00a583fe989bcb72a ':
mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 4 Dec 2013 21:53:18 +0000 (16:53 -0500)]
webp: add a special case for a huffman table with only 1 symbol
The vlc reader cannot handle 0-bit huffman codes. For most
situations WebP uses the "simple" huffman coding for this case,
but that will only handle symbols up to 255. For the LZ77 distance
codes, larger symbol values are needed, so it can happen in rare
cases that a normal huffman table is used that only has a single
symbol.
Justin Ruggles [Wed, 4 Dec 2013 21:53:17 +0000 (16:53 -0500)]
webp: do not call av_frame_free() on the user-provided frame
Fixes double-free on error.
Michael Niedermayer [Fri, 6 Dec 2013 01:18:44 +0000 (02:18 +0100)]
Merge commit '
b7254288d222013e20539c530b1ec5d324ed5352 '
* commit '
b7254288d222013e20539c530b1ec5d324ed5352 ':
mpegvideo: do not update last_non_b_pict_type in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:12:11 +0000 (02:12 +0100)]
Merge commit '
1f8eb69079880ef1f394c498dfdf471f91222a06 '
* commit '
1f8eb69079880ef1f394c498dfdf471f91222a06 ':
mpegvideo: move encoding-only initialization from common_init() to encode_init()
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:58:28 +0000 (01:58 +0100)]
Merge commit '
bedf952bb80ae26427854dcde56c139ecb87d4a0 '
* commit '
bedf952bb80ae26427854dcde56c139ecb87d4a0 ':
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:52:41 +0000 (01:52 +0100)]
Merge commit '
2cab011f0f02fcff8a0629a611bcac2f0459f04a '
* commit '
2cab011f0f02fcff8a0629a611bcac2f0459f04a ':
mpegvideo: don't copy input_picture_number in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:45:25 +0000 (01:45 +0100)]
Merge commit '
ff7ffe48097f32417781fe8b2b417eff05a52c55 '
* commit '
ff7ffe48097f32417781fe8b2b417eff05a52c55 ':
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)]
Merge commit '
f7d228676cb7669059889c4225c8a8dc56708c24 '
* commit '
f7d228676cb7669059889c4225c8a8dc56708c24 ':
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:27:53 +0000 (01:27 +0100)]
Merge commit '
a097f0049b28dc3ed13625e4a42619292c92492f '
* commit '
a097f0049b28dc3ed13625e4a42619292c92492f ':
mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:21:28 +0000 (01:21 +0100)]
Merge commit '
ff300e435e5337b03dc7a8f1c0be6c9937059c1e '
* commit '
ff300e435e5337b03dc7a8f1c0be6c9937059c1e ':
mpegvideo: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:14:46 +0000 (01:14 +0100)]
Merge commit '
e41ff4210ac1192c62de3052b33a38c7bcf772f2 '
* commit '
e41ff4210ac1192c62de3052b33a38c7bcf772f2 ':
mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 5 Dec 2013 20:50:14 +0000 (17:50 -0300)]
Add Windows resource file support for shared libraries
Originally written by James Almer <jamrial@gmail.com>
With the following contributions by Timothy Gu <timothygu99@gmail.com>
* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.
[1] http://msdn.microsoft.com/en-us/library/windows/desktop/
aa381058 .aspx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 5 Dec 2013 20:17:21 +0000 (21:17 +0100)]
Ignore es_map_length when parsing mpeg program stream map.
Fixes ticket #3195.
Michael Niedermayer [Thu, 5 Dec 2013 16:38:25 +0000 (17:38 +0100)]
avformat/mov: calculate rfps from the first 100 frames of the index
This reduces the amount of frames that need to be demuxed in av_find_stream_info()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 15:56:17 +0000 (16:56 +0100)]
avformat/utils: factor rfps calculation out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 15:06:24 +0000 (16:06 +0100)]
avformat/utils: provide more IO statistics in debug output at start and end of av_find_streaminfo()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 13:08:06 +0000 (14:08 +0100)]
avcodec/mjpegenc: use av_log2_16bit() in encode_block()
This reduces the number of operations done per non zero coefficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 2 Dec 2013 22:56:51 +0000 (23:56 +0100)]
ljpegenc: split yuv encoding into a separate function
Anton Khirnov [Mon, 2 Dec 2013 22:56:51 +0000 (23:56 +0100)]
ljpegenc: split bgr encoding into a separate function
Anton Khirnov [Mon, 2 Dec 2013 22:49:11 +0000 (23:49 +0100)]
ljpegenc: accept bgr24 instead of bgra
The alpha plane is not encoded.
Anton Khirnov [Mon, 2 Dec 2013 22:34:37 +0000 (23:34 +0100)]
ljpegenc: rename the encoding function.
The new name is more consistent with the rest of Libav.
Anton Khirnov [Mon, 2 Dec 2013 22:33:56 +0000 (23:33 +0100)]
ljpeg: remove a commented-out line
Anton Khirnov [Mon, 2 Dec 2013 18:22:54 +0000 (19:22 +0100)]
ljpegenc: deMpegEncContextize
The encoder uses almost none of the mpegvideo infrastructure, only some
fields from MpegEncContext.
The FATE results change because now an all-zero quant matrix is written
into the file. Since it is not used for anything for ljpeg, this should
not be a problem.
Anton Khirnov [Sun, 1 Dec 2013 21:05:18 +0000 (22:05 +0100)]
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
This will allow deMpegEncContextizing the LJPEG encoder.
Anton Khirnov [Sun, 1 Dec 2013 21:05:18 +0000 (22:05 +0100)]
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()
This will allow deMpegEncContextizing the LJPEG encoder.
Anton Khirnov [Sun, 1 Dec 2013 21:05:18 +0000 (22:05 +0100)]
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()
This will allow deMpegEncContextizing the LJPEG encoder.
Anton Khirnov [Sun, 1 Dec 2013 20:45:40 +0000 (21:45 +0100)]
mjpegenc: do not pass MpegEncContext to jpeg_table_header()
Pass the three needed fields from it directly.
This will allow to deMpegEncContextize the LJPEG encoder.
Anton Khirnov [Sun, 1 Dec 2013 20:40:17 +0000 (21:40 +0100)]
mjpegenc: remove commented out never-to-be-finished WIP cruft
Anton Khirnov [Sun, 1 Dec 2013 20:35:02 +0000 (21:35 +0100)]
mjpegenc: do not pass MpegEncContext to put_huffman_table()
It only needs PutBitContext from it, so pass that directly.
Anton Khirnov [Sun, 1 Dec 2013 20:33:47 +0000 (21:33 +0100)]
mjpegenc: cosmetics, reformat jpeg_put_comments()
Anton Khirnov [Sun, 1 Dec 2013 20:31:25 +0000 (21:31 +0100)]
mjpegenc: write the JFIF header if the sample aspect ratio is set
MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was
never written before.
Anton Khirnov [Sun, 1 Dec 2013 11:57:47 +0000 (12:57 +0100)]
mpegvideo: do not set current_picture_ptr in decoders
This code was originally added in
5f1948111a4920ff74e31b4284ab0200f7938539 to h263 to set decoded frame
pts to some random numbers (removed in
a1c5cc429d99216406170eac7e8352860076d3e8 ) and then cargo culted to other
decoders.
The code is left in h263dec for now, since some part of the decoder
(apparently OBMC) relies on the specific previous frame to be reused.
Anton Khirnov [Sun, 1 Dec 2013 08:42:37 +0000 (09:42 +0100)]
FATE: drop the last partial frame in the wmv8-drm test
This has already been done in
eb066a4ce9e82cddb8f5af574804aa9889450b34 ,
but the number of frames produced from that file changed due to
timestamps changes since then.
Anton Khirnov [Sat, 30 Nov 2013 17:36:00 +0000 (18:36 +0100)]
vc1dec: move setting repeat_pict after frame_start() has been called.
This will allow removing the hacks where each decoder sets
current_picture_ptr on its own.
Anton Khirnov [Sat, 30 Nov 2013 17:07:06 +0000 (18:07 +0100)]
mpegvideo: make ff_release_unused_pictures() static
It is only called from one place in mpegvideo.c now. Also remove the
remove_current parameter, which is always 1.
Anton Khirnov [Sat, 30 Nov 2013 10:58:42 +0000 (11:58 +0100)]
mpegvideo: make frame_size_alloc() static.
It is not called from outside of mpegvideo.c anymore.
Anton Khirnov [Sat, 30 Nov 2013 10:50:09 +0000 (11:50 +0100)]
mpegvideo: move encode-only parts of common_end() to encode_end()
Anton Khirnov [Sat, 30 Nov 2013 10:35:50 +0000 (11:35 +0100)]
mpegvideo: remove commented out cruft from ff_MPV_frame_end()
Anton Khirnov [Sat, 30 Nov 2013 10:34:37 +0000 (11:34 +0100)]
mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function
Anton Khirnov [Sat, 30 Nov 2013 10:32:25 +0000 (11:32 +0100)]
mpegvideo: do not update last_non_b_pict_type in update_thread_context()
It is used for encoding only.
Anton Khirnov [Sat, 30 Nov 2013 10:10:53 +0000 (11:10 +0100)]
mpegvideo: move encoding-only initialization from common_init() to encode_init()
Anton Khirnov [Sat, 30 Nov 2013 09:50:20 +0000 (10:50 +0100)]
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Anton Khirnov [Sat, 30 Nov 2013 09:47:52 +0000 (10:47 +0100)]
mpegvideo: don't copy input_picture_number in update_thread_context()
It is encoding-only, frame threading is not used for encoding.
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context
Anton Khirnov [Fri, 29 Nov 2013 21:18:15 +0000 (22:18 +0100)]
mpegvideo: remove an unused variable
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext
Michael Niedermayer [Thu, 5 Dec 2013 10:55:38 +0000 (11:55 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Initialize mmxext after amd3dnow optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 02:53:39 +0000 (03:53 +0100)]
avcodec/cavsdec: print error messages in case of errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 02:51:08 +0000 (03:51 +0100)]
avcodec/cavsdec: use more specific error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 01:17:15 +0000 (02:17 +0100)]
avcodec/cavsdec: print warning if no frame has been decoded
Fixes ticket3128
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 01:16:59 +0000 (02:16 +0100)]
avcodec/cavsdec: reset stc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 00:41:10 +0000 (01:41 +0100)]
avcodec/cabac: force get_cabac to be not inlined
works around bug in gccs inline asm register assignment
Fixes Ticket3177
gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 21:05:11 +0000 (22:05 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Detect msvcrt libc with a CPP check instead of a link check
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 19:50:11 +0000 (20:50 +0100)]
Merge commit '
5ec467328122b80fac94c2d5e3e7540d50381868 '
* commit '
5ec467328122b80fac94c2d5e3e7540d50381868 ':
configure: Add detected C library and host compiler to informative output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 19:25:43 +0000 (20:25 +0100)]
swresample: use the internal buffer for resampling the last few samples
Fixes out of array read
Fixes Ticket3193
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 30 Sep 2013 13:04:44 +0000 (15:04 +0200)]
x86: Initialize mmxext after amd3dnow optimizations
The mmxext optimizations should be at least equally fast if available and
amd3dnow optimizations are being deprecated. Thus the former should
override the latter, not the other way around.
Diego Biurrun [Wed, 4 Dec 2013 15:25:04 +0000 (10:25 -0500)]
configure: Detect msvcrt libc with a CPP check instead of a link check
Simplifies host/target libc detection splitting.
Diego Biurrun [Thu, 28 Feb 2013 15:06:39 +0000 (16:06 +0100)]
configure: Add detected C library and host compiler to informative output
Michael Niedermayer [Wed, 4 Dec 2013 13:34:05 +0000 (14:34 +0100)]
avformat/utils: move update_wrap_reference() up
simplifies code
also remove extra {}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 13:29:35 +0000 (14:29 +0100)]
avformat/utils: reorder operations in update_wrap_reference()
prevents a integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 10:35:21 +0000 (11:35 +0100)]
Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"
This reverts commit
758b6d39f685a510f48ff9e4c05fffa859d23c42 .
Requested-by: smarter
"now that http://git.videolan.org/?p=ffmpeg.git;a=commit;h=
97de206b44a48da726807cc3e7b9448a8112760b
has been merged, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=
758b6d39f685a510f48ff9e4c05fffa859d23c42
could be reverted, this would reduce the delta with libav
(and it makes sense)"
Michael Niedermayer [Wed, 4 Dec 2013 03:30:42 +0000 (04:30 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: initialize hwaccel_pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rainer Hochecker [Tue, 3 Dec 2013 09:03:04 +0000 (10:03 +0100)]
mpegts: do not set pts for missing dts in video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 01:00:23 +0000 (02:00 +0100)]
avformat/utils: correct for timestamp wrap earlier
This uses dts & pts as reference instead of first_dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 01:15:41 +0000 (02:15 +0100)]
avformat/utils: also fix wrapping of start_time in update_initial_timestamps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 00:49:14 +0000 (01:49 +0100)]
avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 3 Dec 2013 20:25:36 +0000 (21:25 +0100)]
ffprobe: free shared writer context on exit
Fix leak.
Spotted-by: Michael Niedermayer
Michael Niedermayer [Tue, 3 Dec 2013 18:55:12 +0000 (19:55 +0100)]
libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT
The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 12:15:35 +0000 (13:15 +0100)]
avcodec: split mp2 encoder into float and fixed
This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 23 Nov 2013 13:07:48 +0000 (14:07 +0100)]
avconv: initialize hwaccel_pix_fmt
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.
Ronald S. Bultje [Tue, 3 Dec 2013 12:29:35 +0000 (07:29 -0500)]
vp9_parser: handle zero-sized packets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>