]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 13 Sep 2012 13:21:26 +0000 (15:21 +0200)]
Merge commit '
07584eaf4a95db3f11d3bc411f9786932829e82b '
* commit '
07584eaf4a95db3f11d3bc411f9786932829e82b ':
mpegts: check substreams before discarding
Add a smooth streaming segmenter muxer
file: Add an avoption for disabling truncating existing files on open
img2dec: always close AVIOContexts
rtpdec_jpeg: Error out on other unsupported type values as well
rtpdec_jpeg: Disallow using the reserved q values
rtpdec_jpeg: Fold the default qtables case into an existing if statement
rtpdec_jpeg: Store and reuse old qtables for q values 128-254
rtpdec_jpeg: Simplify the calculation of the number of qtables
rtpdec_jpeg: Add more comments about the fields in the SOF0 section
rtpdec_jpeg: Clarify where the subsampling magic numbers come from
rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
rtpdec_jpeg: Simplify writing of the jpeg header
rtpdec_jpeg: Merge two if statements
rtpdec_jpeg: Write the DHT section properly
Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 12 Sep 2012 17:34:21 +0000 (19:34 +0200)]
lavfi/aresample: set buffer properties after copy.
The aresample filter changes the format, layout and/or sample rate,
it can not copy them blindly from its input.
Related to trac ticket #1671.
Christian Schmidt [Thu, 6 Sep 2012 14:43:24 +0000 (16:43 +0200)]
mpegts: check substreams before discarding
Allow to extract the AC3 core from TrueHD with the "copy" codec.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Mon, 19 Mar 2012 21:12:54 +0000 (23:12 +0200)]
Add a smooth streaming segmenter muxer
This muxer splits the output from the ismv muxer into individual
files, in realtime.
The same can also be done by the standalone tool ismindex, but this
muxer is needed for doing it in realtime (especially for live
streams that need extra handling for updating the lookahead fields
in the fragment headers).
Using this muxer, one can deliver live smooth streaming from a
normal static file web server. (Using ismindex, one can deliver
premade smooth streaming files from a static file web server,
or prepare files for serving with IIS.)
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 9 Sep 2012 19:42:56 +0000 (22:42 +0300)]
file: Add an avoption for disabling truncating existing files on open
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 12 Sep 2012 19:12:18 +0000 (21:12 +0200)]
vc1dec: export adv profile color format indication
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 18:35:09 +0000 (20:35 +0200)]
asfdec: invert SAR
It appears this was wrong
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 17:37:29 +0000 (19:37 +0200)]
configure: try to support clang on netbsd
The headers on netbsd are not fully C99 compatible which leads to multiple
definitions of symbols in clang bit not with gcc.
AFAIK this has been fixed in netbsd trunk (didnt check though)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Fri, 7 Sep 2012 11:28:48 +0000 (13:28 +0200)]
img2dec: always close AVIOContexts
Zero sized files would cause the contexts to leak away.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Carl Eugen Hoyos [Wed, 12 Sep 2012 11:33:57 +0000 (13:33 +0200)]
Support decoding of monochrome tiff images without bpp tag.
Carl Eugen Hoyos [Wed, 12 Sep 2012 11:08:27 +0000 (13:08 +0200)]
Fix muxing mjpeg in swf.
Michael Niedermayer [Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideoenc: Add missing AV_ prefix to codec ID
avserver: Add missing #include for av_gettime()
configure: Only disable aligned stack on MSVC on 32 bit
configure: indentation cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 11 Sep 2012 11:42:22 +0000 (14:42 +0300)]
rtpdec_jpeg: Error out on other unsupported type values as well
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:41:42 +0000 (14:41 +0300)]
rtpdec_jpeg: Disallow using the reserved q values
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:39:58 +0000 (14:39 +0300)]
rtpdec_jpeg: Fold the default qtables case into an existing if statement
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:29:54 +0000 (14:29 +0300)]
rtpdec_jpeg: Store and reuse old qtables for q values 128-254
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:43:10 +0000 (14:43 +0300)]
rtpdec_jpeg: Simplify the calculation of the number of qtables
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:54:06 +0000 (12:54 +0300)]
rtpdec_jpeg: Add more comments about the fields in the SOF0 section
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:52:55 +0000 (12:52 +0300)]
rtpdec_jpeg: Clarify where the subsampling magic numbers come from
Write out the numbers the way they are constructed, not just the
final values.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:46:44 +0000 (12:46 +0300)]
rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:44:25 +0000 (12:44 +0300)]
rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
Everything written with this bitstream writer is 8/16 bit units
(except for a pair of 4 bit values), so using a bitstream writer
isn't necessary.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:32:37 +0000 (12:32 +0300)]
rtpdec_jpeg: Simplify writing of the jpeg header
Generalize writing of any number of qtables. Don't manually write
16 bit values in two separate calls.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:07:56 +0000 (12:07 +0300)]
rtpdec_jpeg: Merge two if statements
This makes the code more readable and robust.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 08:03:05 +0000 (11:03 +0300)]
rtpdec_jpeg: Write the DHT section properly
Currently the size header of the generated DHT section is
incorrect, making the mjpeg decoder just skip it. Since the
written huffman tables are the default ones, this failure had
gone undetected.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Sat, 8 Sep 2012 11:00:13 +0000 (13:00 +0200)]
ffprobe: print start_pts and duration_ts stream information
Derek Buitenhuis [Tue, 11 Sep 2012 21:23:47 +0000 (17:23 -0400)]
FATE/bprint: Convert a VLA to a normal array
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 03:17:52 +0000 (05:17 +0200)]
rtmpproto: reorder some expressions to fix compilation with clang without optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 21:33:25 +0000 (23:33 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: increase sample array buffer
configure: add crop filter as ffplay requirement
ffplay: ensure that pictq_prev_picture never fills the picture queue
ffplay: simplify picture allocation
ffplay: make initial window size calculation based on aspect ratio
ffplay: factor display rectangle calculation to its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 11 Sep 2012 19:54:10 +0000 (15:54 -0400)]
diracdsp: Fix unprotected inline asm
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 11 Sep 2012 19:54:09 +0000 (15:54 -0400)]
ffmpeg: Only include unistd.h if it exists
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 11 Sep 2012 20:51:46 +0000 (22:51 +0200)]
lavd/lavfi: apply stylistic fixes to the options help fields
Stefano Sabatini [Tue, 11 Sep 2012 09:49:14 +0000 (11:49 +0200)]
ffprobe: add priv_class field to Writer, and factorize writer options initialization
Marton Balint [Thu, 6 Sep 2012 21:35:04 +0000 (23:35 +0200)]
ffplay: increase sample array buffer
A decoded and resampled audio frame may not fit in the current size which is
not handled by the current code causing out of order waveform displays or even
channel mixups. A todo is added because this part can certainly be improved to
consume less memory but work reliably for any frame size.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 5 Sep 2012 18:33:27 +0000 (20:33 +0200)]
configure: add crop filter as ffplay requirement
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 2 Sep 2012 13:29:54 +0000 (15:29 +0200)]
ffplay: ensure that pictq_prev_picture never fills the picture queue
It was theoretically possible for pictq_prev_picture to fill the picture queue
which may have caused problems when a write to the queue was still in progress.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 1 Sep 2012 15:10:35 +0000 (17:10 +0200)]
ffplay: simplify picture allocation
This also makes sure the aspect ratio of the picture is set before allocating
the picture, this way video_open can calculate with the correct aspect ratio
even for the first frame.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 1 Sep 2012 13:01:29 +0000 (15:01 +0200)]
ffplay: make initial window size calculation based on aspect ratio
Fixes ticket #291.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 1 Sep 2012 12:35:00 +0000 (14:35 +0200)]
ffplay: factor display rectangle calculation to its own function
Signed-off-by: Marton Balint <cus@passwd.hu>
Stefano Sabatini [Tue, 11 Sep 2012 16:25:58 +0000 (18:25 +0200)]
examples/muxing: add check on avformat_write_header() result
Stefano Sabatini [Tue, 11 Sep 2012 16:23:58 +0000 (18:23 +0200)]
examples/muxing: apply misc fixes to log messages
Stefano Sabatini [Tue, 11 Sep 2012 16:21:59 +0000 (18:21 +0200)]
examples/muxing: rename img_convert_ctx to sws_ctx
The new name is more consistent with the codebase, and more
self-consistent with the libswscale API.
Stefano Sabatini [Tue, 11 Sep 2012 16:20:20 +0000 (18:20 +0200)]
examples/muxing: merge some declarations and definitions
Stefano Sabatini [Tue, 11 Sep 2012 16:13:20 +0000 (18:13 +0200)]
examples/muxing: prefer AVPicture to AVFrame, when feasible
Favor the use of plain AVPicture over AVFrame, especially when the use of
AVFrame is not required like in the case of tmp_picture.
Also adopt more straightforward names, to avoid frame/picture confusion.
Derek Buitenhuis [Tue, 11 Sep 2012 15:31:12 +0000 (11:31 -0400)]
postproc: Fix unprotected inline asm
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 6 Sep 2012 15:32:26 +0000 (17:32 +0200)]
lavf/flvenc: convert commented debug log to an av_dlog call
Also add some additional info (DTS and DTS time).
Stefano Sabatini [Tue, 11 Sep 2012 08:32:13 +0000 (10:32 +0200)]
lavfi/amerge: clarify the error message in case of input overlap
Clément Bœsch [Tue, 11 Sep 2012 16:36:09 +0000 (18:36 +0200)]
lavfi/amerge: avoid a forward declaration.
Michael Niedermayer [Tue, 11 Sep 2012 15:41:33 +0000 (17:41 +0200)]
ratecontrol: change a commented printf to av_log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 15:40:54 +0000 (17:40 +0200)]
ratecontrol: fix get_fps() argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 15:38:31 +0000 (17:38 +0200)]
ratecontrol: Dynamically choose a default for rc_max_available_vbv_use
This improves handling of small buffer sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 15:20:08 +0000 (17:20 +0200)]
ratecontrol: correct predictor in case of stuffing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 7 Sep 2012 16:09:19 +0000 (18:09 +0200)]
examples/demuxing: add audio decoding/demuxing
Diego Biurrun [Tue, 11 Sep 2012 15:08:05 +0000 (17:08 +0200)]
utvideoenc: Add missing AV_ prefix to codec ID
Diego Biurrun [Tue, 11 Sep 2012 15:07:37 +0000 (17:07 +0200)]
avserver: Add missing #include for av_gettime()
Michael Niedermayer [Tue, 11 Sep 2012 13:24:22 +0000 (15:24 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_jpeg: Add support for default quantizers
x86: dsputil: Move specific optimization settings out of global init function
avplay: get rid of ugly casts in the options table
avplay: fix prototypes for option callbacks.
flvdec: always set AVFMTCTX_NOHEADER.
file: Use a normal private context for storing the file descriptor
configure: Adjust the xgetbv instrinsic check
configure: Add --disable-inline-asm command line option
configure: Don't try to enable the log2 function on msvcrt
Conflicts:
configure
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavformat/file.c
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 11 Sep 2012 08:10:12 +0000 (11:10 +0300)]
configure: Only disable aligned stack on MSVC on 32 bit
On 64 bit, the stack seems to be aligned enough for our needs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Tue, 11 Sep 2012 04:41:55 +0000 (06:41 +0200)]
lavfi/amerge: fix input pad name behaviour.
This fixes two problems:
- the invalid pad.name stack pointer after init() ends
- the duplicated name for all inputs
Diego Biurrun [Sun, 19 Aug 2012 19:35:30 +0000 (21:35 +0200)]
configure: indentation cosmetics
Carl Eugen Hoyos [Tue, 11 Sep 2012 10:19:09 +0000 (12:19 +0200)]
The TrueHD decoder needs the MLP parser.
Samuel Pitoiset [Mon, 10 Sep 2012 19:15:09 +0000 (21:15 +0200)]
rtpdec_jpeg: Add support for default quantizers
Generate quantization tables when they are not present in the
first chunk.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Wed, 5 Sep 2012 14:42:57 +0000 (16:42 +0200)]
x86: dsputil: Move specific optimization settings out of global init function
They belong in the init functions specific to each CPU capability.
Anton Khirnov [Mon, 10 Sep 2012 12:42:24 +0000 (14:42 +0200)]
avplay: get rid of ugly casts in the options table
Anton Khirnov [Mon, 10 Sep 2012 12:37:46 +0000 (14:37 +0200)]
avplay: fix prototypes for option callbacks.
They have been wrong since
11d957fbd81288e64408e79ed369446346000b29
Anton Khirnov [Sat, 1 Sep 2012 14:20:58 +0000 (16:20 +0200)]
flvdec: always set AVFMTCTX_NOHEADER.
New streams may be created at any time, e.g. on codec change.
Michael Niedermayer [Tue, 11 Sep 2012 05:13:49 +0000 (07:13 +0200)]
cavsdec/decode_mb_b: fix return type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 02:55:01 +0000 (04:55 +0200)]
xtea: optimize core, about 4-5% faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 00:52:12 +0000 (02:52 +0200)]
x86/swscale: use unsigned to build SIMD values to avoid signed overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 00:51:09 +0000 (02:51 +0200)]
lavf/avformat_seek_file: fix harmless integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 23:58:03 +0000 (01:58 +0200)]
aacdec/lcg_random: fix harmless integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 21:28:48 +0000 (23:28 +0200)]
cavsdec: Fix assertion failure.
The assert in decode_mb_b() is replaced by a normal error check for the
case that can occur with a damaged or crafted bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 1 Sep 2012 16:01:51 +0000 (18:01 +0200)]
lavf/segment: add segment_list_flags option
Allow to specify options affecting the segment list generation.
In particular: add +live and +cache flags.
For a full discussion read trac ticket #1642:
http://ffmpeg.org/trac/ffmpeg/ticket/1642
Also add live M3U8 generation example.
Stefano Sabatini [Mon, 10 Sep 2012 16:08:09 +0000 (18:08 +0200)]
lavc/h263dec: return or propagate proper error codes
Stefano Sabatini [Mon, 10 Sep 2012 16:07:49 +0000 (18:07 +0200)]
lavc/flvdec: return meaningful error codes
Stefano Sabatini [Mon, 10 Sep 2012 11:36:27 +0000 (13:36 +0200)]
ffprobe: add print_section option to the compact writer
Allow to skip section name at the begin of each line. Possibly simplify
output.
Stefano Sabatini [Mon, 10 Sep 2012 08:49:03 +0000 (10:49 +0200)]
ffprobe: add and use DEFINE_WRITER_CLASS macro
Factorize writer class definition.
Michael Niedermayer [Mon, 10 Sep 2012 20:34:18 +0000 (22:34 +0200)]
mpegaudiodec: replace pow(2.0,...) by exp2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 20:32:56 +0000 (22:32 +0200)]
atrac3: replace powf(2,...) by exp2f()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 18:55:45 +0000 (20:55 +0200)]
sws/output: use unsigned variables where harmless overflows are expected.
signed overflow is undefined in C ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 18:54:03 +0000 (20:54 +0200)]
ra144enc: avoid integer overflows.
The values are all positive but signed variables where used,
which overflowed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 18:52:40 +0000 (20:52 +0200)]
ffmpeg: check timebase validity before considering it to be used for stream copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 18:51:27 +0000 (20:51 +0200)]
ffmpeg: fix bytes written statistics.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 18:15:58 +0000 (20:15 +0200)]
mpegtsenc: add forgotten ()
Fixes integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 10 Sep 2012 10:02:30 +0000 (12:02 +0200)]
lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio
Should be more robust/consistent.
Stefano Sabatini [Mon, 10 Sep 2012 09:58:53 +0000 (11:58 +0200)]
lavfi/setpts: add FRAME_RATE constant
Useful for dealing with constant frame-rate video.
Martin Storsjö [Sun, 9 Sep 2012 19:35:50 +0000 (22:35 +0300)]
file: Use a normal private context for storing the file descriptor
Previously the file descriptor was stored in the priv_data pointer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 10 Sep 2012 14:35:39 +0000 (17:35 +0300)]
configure: Adjust the xgetbv instrinsic check
The 64 bit cl.exe version 16.00.30319.01 crashes with an internal
compiler error on the current check (and thus deduces it isn't
supported, even if the actual usage in libavuil/x86/cpu.c works
fine), but by assigning the value from the intrinsic to a variable,
or returning it, it works fine.
This error is fixed in cl.exe version 16.00.40219.01.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Tue, 4 Sep 2012 16:23:25 +0000 (18:23 +0200)]
configure: Add --disable-inline-asm command line option
This can come in handy for testing and possibly other purposes.
Sébastien Brochet [Sun, 9 Sep 2012 09:00:27 +0000 (11:00 +0200)]
add OTF support for attachments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 14:57:31 +0000 (16:57 +0200)]
utils/update_stream_timings: fix division by zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 14:56:59 +0000 (16:56 +0200)]
avidec/guess_ni_flag: fix harmless integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 10 Sep 2012 12:34:51 +0000 (15:34 +0300)]
configure: Don't try to enable the log2 function on msvcrt
Some msvcrt versions (the static 64 bit libc in MSVC 10) have
a log2 function, but there is no declaration for it in the headers.
Therefore, the normal configure check might find it, but it can fail
during build or at runtime, depending on whether implicit function
declarations are an error or not.
Therefore simply ignore this function on this platform.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 10 Sep 2012 14:15:07 +0000 (16:15 +0200)]
compute_pkt_fields: fix harmless integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Mon, 10 Sep 2012 05:40:41 +0000 (22:40 -0700)]
lavc/pngenc: Enable frame threading for PNG encodes
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Sep 2012 12:05:42 +0000 (14:05 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 9 Sep 2012 11:59:02 +0000 (13:59 +0200)]
ffprobe: simplify default printer
Remove pointless default_print_footer() and
default_print_chapter_header() callbacks, also avoid to print an
empty line when noprint_wrappers is selected.
Diego Biurrun [Sun, 9 Sep 2012 19:19:50 +0000 (21:19 +0200)]
x86: dsputil: Only compile motion_est code when encoders are enabled
Mans Rullgard [Sun, 9 Sep 2012 21:47:15 +0000 (22:47 +0100)]
mem: fix typo in check for __ICC
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Sep 2012 15:49:54 +0000 (16:49 +0100)]
fate: mp3: drop redundant CMP setting
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reinhard Nissl [Sun, 9 Sep 2012 19:55:23 +0000 (21:55 +0200)]
aacdec.c: fix some comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Fri, 7 Sep 2012 17:30:23 +0000 (19:30 +0200)]
rtp: Depacketization of JPEG (RFC 2435)
Signed-off-by: Martin Storsjö <martin@martin.st>