OSDN Git Service
Kim Nguyen [Mon, 20 Jun 2011 22:18:54 +0000 (00:18 +0200)]
ppc32: Fix movrel
Fixes ticket272
Ivan Kalvachev [Thu, 16 Jun 2011 16:35:33 +0000 (19:35 +0300)]
Fix bink audio playback outside of FFmpeg.
There are 2 known Bink audio codecs. Additionally they have
a different flavor if they are found inside Bink-b "BIKb" file.
In order to guess the correct flavor, the demuxer sets the audio
codec_tag to be the same as the file format tag.
This causes problem because same tag is used for both audio codecs.
The hack works in FFmpeg because audio codecs are identified by their
codec_id, but other players rely on standard behavior.
This fix removes the codec_tag hack and instead uses artificial
extradata format to signal the codec flavor. This would also
allow proper embedding of Bink audio in other containers.
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jun 2011 18:13:26 +0000 (20:13 +0200)]
ffmpeg: print warning if encoding would duplicate massive amounts of frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jun 2011 11:22:23 +0000 (13:22 +0200)]
cmdutils: remove outcommented merge trash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jun 2011 01:49:51 +0000 (03:49 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop git- prefix from version labels
Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
path64/open64: filter out unsupported flags
Add Release Notes
sipr: Drop unused DSPContext
sipr: include string.h for mem*()
sipr: Use memmove() to copy overlapped buffers.
h264: drop some ugly casts
Conflicts:
version.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 18:32:37 +0000 (20:32 +0200)]
dump_metadata: Fix 0xd in metadata
Fixed ticket245
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 18:02:30 +0000 (20:02 +0200)]
Attempt to fix ticket266
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 15:57:51 +0000 (17:57 +0200)]
eval: Fix 32bit unsigned parsing
Fixes ticket264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 11:09:16 +0000 (13:09 +0200)]
avidec: consider non video to contain only keyframes when seeking.
Fixes Ticket271
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 03:55:12 +0000 (05:55 +0200)]
ffplay: dont drop frames by default when there is no audio stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mina Nagy Zaki [Sun, 19 Jun 2011 18:31:24 +0000 (20:31 +0200)]
lavfi: add layout negotiation fields and helper functions.
Mina Nagy Zaki [Tue, 7 Jun 2011 18:17:23 +0000 (21:17 +0300)]
lavfi: use int64_t lists in AVFilteFormats
The list type was changed to int64_t to be able to hold
channel layouts.
avfilter_make_format_list() still takes a int32_t array and converts
it to int64_t. A new function, avfilter_make_format64_list, that
takes int64_t arrays has been added.
Stefano Sabatini [Sun, 19 Jun 2011 20:07:18 +0000 (22:07 +0200)]
lavfi: fix realloc size computation in avfilter_add_format()
Replace sizeof((*avff)->formats)
with sizeof(*(*avff)->formats)
as the size of the array element is given by the pointed element
rather than by its pointer.
In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).
Stefano Sabatini [Sun, 19 Jun 2011 20:42:09 +0000 (22:42 +0200)]
lavfi: fix Makefile HEADERS
Add a missing space between vsink_buffer.h and vsrc_buffer.h.
1000l.
Mans Rullgard [Sun, 19 Jun 2011 18:31:56 +0000 (19:31 +0100)]
Drop git- prefix from version labels
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reinhard Tartler [Sun, 19 Jun 2011 17:51:20 +0000 (19:51 +0200)]
Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.
Mans Rullgard [Sun, 19 Jun 2011 17:03:21 +0000 (18:03 +0100)]
path64/open64: filter out unsupported flags
These flags are accepted without error but produce an annoying
warning. Filtering them out makes the build less noisy.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reinhard Tartler [Sun, 19 Jun 2011 17:45:36 +0000 (19:45 +0200)]
Add Release Notes
Stefano Sabatini [Sat, 11 Jun 2011 16:43:11 +0000 (18:43 +0200)]
lavfi: add vsink_buffer, and use it in ff* tools
Also add the public interface libavfilter/vsink_buffer.h.
Stefano Sabatini [Fri, 17 Jun 2011 23:52:40 +0000 (01:52 +0200)]
vsrc_color: use internal timebase
Avoid timescale conversion, simplify.
Stefano Sabatini [Sun, 19 Jun 2011 00:49:04 +0000 (02:49 +0200)]
opt: do not crash in av_set_options_string() if opts == NULL
Add missing NULL check, and update documentation accordingly.
Stefano Sabatini [Sat, 28 May 2011 20:00:26 +0000 (22:00 +0200)]
lavfi: add negate filter
This filter is a simple wrapper around the LUT filter.
Stefano Sabatini [Sat, 28 May 2011 19:51:03 +0000 (21:51 +0200)]
lavfi: add LUT (LookUp Table) generic filters
Alex Converse [Sat, 18 Jun 2011 22:45:45 +0000 (15:45 -0700)]
sipr: Drop unused DSPContext
Alex Converse [Sat, 18 Jun 2011 22:44:31 +0000 (15:44 -0700)]
sipr: include string.h for mem*()
Alex Converse [Sat, 18 Jun 2011 22:42:57 +0000 (15:42 -0700)]
sipr: Use memmove() to copy overlapped buffers.
Alex Converse [Sat, 18 Jun 2011 05:03:24 +0000 (22:03 -0700)]
h264: drop some ugly casts
Michael Niedermayer [Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: prevent crash in av_open_input_file() if ap == NULL.
more Changelog additions
lavf: add a forgotten NULL check in convert_format_parameters().
Fix build if yasm is not available.
H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jun 2011 01:33:15 +0000 (03:33 +0200)]
swscale: fix mono input for width%8
Fixes ticket193
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ami_stuff [Sat, 18 Jun 2011 23:47:25 +0000 (01:47 +0200)]
avidec: Ignore unknown stream types
Improves ticket131
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 22:02:55 +0000 (00:02 +0200)]
h264: print actual slice number in "Too many slices" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 22:00:52 +0000 (00:00 +0200)]
jpegdec: include mjpb_skiptosod in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 21:59:27 +0000 (23:59 +0200)]
jpegdec: fix CJPG decoding.
Fixes ticket133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 19:59:11 +0000 (21:59 +0200)]
w32threads: with only 1 thread there cant be a active threading mode.
Fixes ticket284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 19:54:11 +0000 (21:54 +0200)]
ffmpeg: warn if samples need to be converted in a lossy way for lossless encoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 19:53:54 +0000 (21:53 +0200)]
flacenc: mark as lossless codec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 19:53:20 +0000 (21:53 +0200)]
libavcodec: add CODEC_CAP_LOSSLESS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 18 Jun 2011 19:33:49 +0000 (15:33 -0400)]
lavf: prevent crash in av_open_input_file() if ap == NULL.
Needed for proper behaviour in our old API compatibility code.
Reinhard Tartler [Thu, 16 Jun 2011 17:59:47 +0000 (19:59 +0200)]
more Changelog additions
Anton Khirnov [Sat, 18 Jun 2011 15:26:40 +0000 (17:26 +0200)]
lavf: add a forgotten NULL check in convert_format_parameters().
Ronald S. Bultje [Sat, 18 Jun 2011 12:34:14 +0000 (08:34 -0400)]
Fix build if yasm is not available.
Daniel Kang [Sun, 5 Jun 2011 22:33:23 +0000 (18:33 -0400)]
H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.
Mainly ported from 8-bit H.264 MC Chroma.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Clément Bœsch [Wed, 15 Jun 2011 18:26:57 +0000 (20:26 +0200)]
dcaenc: small quantization simplification.
Carl Eugen Hoyos [Sat, 18 Jun 2011 07:36:07 +0000 (09:36 +0200)]
Fix -s documentation.
Michael Niedermayer [Sat, 18 Jun 2011 02:40:18 +0000 (04:40 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add opt_find to AVCodecContext class.
h264: Complexify frame num gap shortening code
intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
Add minor bumps and APIChanges entries for lavf private options.
ffmpeg: deprecate -vc and -tvstd
ffmpeg: use new avformat_open_* API.
ffserver: use new avformat_open_* API.
ffprobe: use new avformat_open_* API.
ffplay: use new avformat_open_* API.
cmdutils: add opt_default2().
dict: add AV_DICT_APPEND flag.
lavf: add avformat_write_header() as a replacement for av_write_header().
Deprecate av_open_input_* and remove their uses.
lavf: add avformat_open_input() as a replacement for av_open_input_*
AVOptions: add av_opt_find() as a replacement for av_find_opt.
AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
ffmpeg: don't abuse a global for passing frame size from input to output
ffmpeg: don't abuse a global for passing pixel format from input to output
ffmpeg: initialise encoders earlier.
Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
ffprobe.c
libavcodec/h264.c
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jun 2011 00:44:17 +0000 (02:44 +0200)]
qdm2: Fix alignment of local array.
Fixes ticket270
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 17 Jun 2011 23:47:37 +0000 (01:47 +0200)]
vsrc_color: set output pos values to -1
-1 is more correct than 0, as the position in the file is undefined.
Stefano Sabatini [Fri, 17 Jun 2011 23:46:27 +0000 (01:46 +0200)]
vsrc_color: add @file doxy
Also remove outdated reference to color in vf_pad.c.
Stefano Sabatini [Sat, 18 Jun 2011 00:02:31 +0000 (02:02 +0200)]
graphparser: add missing NULL check in avfilter_graph_parse()
Fix a crash occurring when open_inputs is NULL and *open_inputs is
checked, the crash was introduced by the recent avfilter_graph_parse()
syntax change.
In particular, fix graph2dot crash.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:45:38 +0000 (23:45 +0200)]
Support DTS in mp4/mov.
Anton Khirnov [Fri, 17 Jun 2011 04:39:42 +0000 (06:39 +0200)]
lavc: add opt_find to AVCodecContext class.
Fixes encoder private options, which are broken now in ffmpeg, because
opt_default2() can't find them, thus making opt_default() to fail.
Michael Niedermayer [Fri, 17 Jun 2011 03:49:41 +0000 (05:49 +0200)]
Merge commit '
9446d75941d639f19cfa9ae007eb4c5ca041f200'
* commit '
9446d75941d639f19cfa9ae007eb4c5ca041f200':
ffmpeg: merge output_codecs array into AVOutputStream members.
rtpenc_latm: Consistently use "Libav" in license boilerplate.
rtsp: Don't pass string pointer as format string to ff_url_join
mmsh: fixed printf injection bug in mmsh request
codec-regression: remove pointless -r options for dnxhd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:21:19 +0000 (23:21 +0200)]
Do not crash if SDL_SetVideoMode() fails.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:20:29 +0000 (23:20 +0200)]
Move do_exit() and stream_close() up.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:16:58 +0000 (23:16 +0200)]
Fix documentation for -ar and -ac.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:14:17 +0000 (23:14 +0200)]
Fix compilation with old yasm.
Michael Niedermayer [Thu, 16 Jun 2011 21:06:27 +0000 (23:06 +0200)]
ffmpeg: Force 420 with target dvd and svcd.
Fixes ticket283
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strange [Sun, 12 Jun 2011 20:40:00 +0000 (20:40 +0000)]
h264: Complexify frame num gap shortening code
By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Uoti Urpala [Tue, 14 Jun 2011 21:53:30 +0000 (21:53 +0000)]
intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
The output type of the AV_RL32/AV_RB32 macros was signed int. The
resulting overflow broke at least some ASF streams with large
timestamps. Fix by adding a cast to uint32_t.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mike Scheutzow [Thu, 28 Apr 2011 14:14:26 +0000 (10:14 -0400)]
Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
One of the causes of this bug is that the h264 parser defaults low_delay
to 1, but the h264 codec defaults low_delay to 0. Really Ugly.
After many hours of looking at this, I'm still not sure how has_b_frames
is *intended* to behave, but to me the implementation appears way more
complicated than it ought to be.
My patch relies on the encoder to set an optional field in the SPS. This
works for libx264 streams, but I'm not sure that all h264 encoders will
set it.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 16 Jun 2011 15:21:46 +0000 (17:21 +0200)]
Add minor bumps and APIChanges entries for lavf private options.
Anton Khirnov [Wed, 15 Jun 2011 05:34:12 +0000 (07:34 +0200)]
ffmpeg: deprecate -vc and -tvstd
They've been replaced by demuxer private options.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffmpeg: use new avformat_open_* API.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffserver: use new avformat_open_* API.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffprobe: use new avformat_open_* API.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffplay: use new avformat_open_* API.
Anton Khirnov [Wed, 25 May 2011 14:42:41 +0000 (16:42 +0200)]
cmdutils: add opt_default2().
It stores options in a dictionary to be passed to new open calls.
It will replace opt_default once all the pieces are in place.
Anton Khirnov [Sat, 4 Jun 2011 16:43:05 +0000 (18:43 +0200)]
dict: add AV_DICT_APPEND flag.
Anton Khirnov [Sun, 22 May 2011 11:53:33 +0000 (13:53 +0200)]
lavf: add avformat_write_header() as a replacement for av_write_header().
It supports more convenient setting of AVOptions.
Anton Khirnov [Sat, 4 Jun 2011 15:36:30 +0000 (17:36 +0200)]
Deprecate av_open_input_* and remove their uses.
Deprecate the last remaining member of AVFormatParameters.
Anton Khirnov [Sun, 22 May 2011 06:37:25 +0000 (08:37 +0200)]
lavf: add avformat_open_input() as a replacement for av_open_input_*
Add support for demuxer private options.
Anton Khirnov [Sun, 22 May 2011 11:25:19 +0000 (13:25 +0200)]
AVOptions: add av_opt_find() as a replacement for av_find_opt.
Anton Khirnov [Sun, 22 May 2011 10:52:50 +0000 (12:52 +0200)]
AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
This way the caller can pass all the options in one nice package.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing frame size from input to output
It's broken with multiple files or video streams.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing pixel format from input to output
It's broken with multiple files or video streams.
Kirill Zorin [Thu, 16 Jun 2011 18:15:53 +0000 (20:15 +0200)]
mmsh: fix 400 bad request
There is no need to write two HTTP newlines (\r\n) into "headers",
because http_connect (in http.c) already appends one HTTP newline at
the end of the given headers chunk, which would result in sending
three HTTP newlines after the headers. Most of the time it's okay
(although not RFC-conforming), but many proxy servers and the
occasional strict httpd will puke with a "400 bad request".
Anton Khirnov [Thu, 16 Jun 2011 16:04:56 +0000 (18:04 +0200)]
ffmpeg: merge output_codecs array into AVOutputStream members.
There's no point in keeping them separate.
Anton Khirnov [Thu, 16 Jun 2011 04:24:54 +0000 (06:24 +0200)]
ffmpeg: initialise encoders earlier.
Fixes choosing supported samplerate and framerate.
Diego Biurrun [Thu, 16 Jun 2011 15:04:06 +0000 (17:04 +0200)]
rtpenc_latm: Consistently use "Libav" in license boilerplate.
Martin Storsjö [Thu, 16 Jun 2011 08:04:27 +0000 (11:04 +0300)]
rtsp: Don't pass string pointer as format string to ff_url_join
In this case, the string that was passed couldn't contain
user-defined data and thus there was no risk for injection
bugs, but it's safer this way, if we later change the
content of the options string.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kirill Zorin [Wed, 15 Jun 2011 17:18:29 +0000 (19:18 +0200)]
mmsh: fixed printf injection bug in mmsh request
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Thu, 16 Jun 2011 05:24:14 +0000 (07:24 +0200)]
codec-regression: remove pointless -r options for dnxhd
Michael Niedermayer [Thu, 16 Jun 2011 01:53:58 +0000 (03:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: use correct alignment and length in channel coupling dsp functions.
ffmpeg: don't abuse a global for passing framerate from input to output
ffmpeg: don't abuse a global for passing channels from input to output
ffmpeg: don't abuse a global for passing samplerate from input to output
ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
swscale: use SwsContext for av_log when available
swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
swscale: Fix compilation with --disable-mmx2.
Conflicts:
ffmpeg.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kirill Zorin [Wed, 15 Jun 2011 17:18:29 +0000 (19:18 +0200)]
mmsh: fixed printf injection bug in mmsh request
Justin Ruggles [Tue, 14 Jun 2011 17:45:38 +0000 (13:45 -0400)]
ac3enc: use correct alignment and length in channel coupling dsp functions.
This fixes a segfault when using the C version of ac3dsp.float_to_fixed24().
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing framerate from input to output
It's broken with multiple files or video streams.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing channels from input to output
It's broken with multiple files or audio streams.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing samplerate from input to output
It's broken with multiple files or audio streams.
This removes the default samplerate of 44100 for raw input, hence all
the FATE changes.
Reimar Döffinger [Wed, 15 Jun 2011 18:21:33 +0000 (20:21 +0200)]
Make buffer size check consistent and avoid a possible overflow.
Reimar Döffinger [Wed, 15 Jun 2011 18:20:47 +0000 (20:20 +0200)]
Fix spelling.
Luca Abeni [Wed, 15 Jun 2011 15:59:03 +0000 (17:59 +0200)]
Full support for sending H.264 in RTP
This implements support for the "MP4" syntax of H.264 bitstreams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 15 Jun 2011 11:58:00 +0000 (12:58 +0100)]
ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
Signed-off-by: Mans Rullgard <mans@mansr.com>
Janne Grunau [Mon, 25 Apr 2011 22:27:48 +0000 (00:27 +0200)]
swscale: use SwsContext for av_log when available
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Andrew Wason [Wed, 15 Jun 2011 09:09:17 +0000 (11:09 +0200)]
Support reading chan atoms with empty channel descriptions.
Fixes ticket 263.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:58:25 +0000 (10:58 +0200)]
Reindent after last commit.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:57:26 +0000 (10:57 +0200)]
Fix multi-channel AAC encoding.
Fixes ticket 55.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:53:18 +0000 (10:53 +0200)]
Fix "redundant redeclaration" warning.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:47:46 +0000 (10:47 +0200)]
Fix compilation with --disable-everything --enable-encoder=ac3/ac3_fixed.
Michael Niedermayer [Wed, 15 Jun 2011 00:15:25 +0000 (02:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: remove misplaced comment.
ffmpeg: fix streaming to ffserver.
swscale: split out RGB48 output functions from yuv2packed[12X]_c().
build: move vpath directives to main Makefile
swscale: fix JPEG-range YUV scaling artifacts.
build: move ALLFFLIBS to a more logical place
ARM: factor some repetitive code into macros
Fix SVQ3 after adding 4:4:4 H.264 support
H.264: fix CODEC_FLAG_GRAY
4:4:4 H.264 decoding support
ac3enc: fix allocation of floating point samples.
Conflicts:
ffmpeg.c
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libswscale/swscale.c
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jun 2011 23:36:12 +0000 (01:36 +0200)]
vf_mp: Fix large memleak.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>