OSDN Git Service
Michael Niedermayer [Mon, 17 Oct 2011 18:36:03 +0000 (20:36 +0200)]
examples/decoding_encoding.c: test mpeg1 and h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 18:23:24 +0000 (20:23 +0200)]
examples/decoding_encoding.c: silence compiler warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 18:22:45 +0000 (20:22 +0200)]
examples/decoding_encoding.c: set a codec private option to demonstrate how to do that
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 18:22:07 +0000 (20:22 +0200)]
examples/decoding_encoding.c: switch to h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 14:51:48 +0000 (16:51 +0200)]
segmenter: loose rindex()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 11:01:23 +0000 (13:01 +0200)]
mpeg4parser: fix initial qp precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 12 Oct 2011 15:06:18 +0000 (17:06 +0200)]
mpeg12: use drop_frame_flag to fix timecode debug format.
Clément Bœsch [Mon, 17 Oct 2011 05:33:10 +0000 (07:33 +0200)]
AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.
Michael Niedermayer [Mon, 17 Oct 2011 01:36:56 +0000 (03:36 +0200)]
segment: Fix typo in segment_basename
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 01:36:22 +0000 (03:36 +0200)]
segment: replace strdup() by av_strdup()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 01:38:27 +0000 (03:38 +0200)]
Merge remote-tracking branch 'luzero/segment'
* luzero/segment:
segment: extend options
segment: basic pattern support and playlist output
segment: introduce segmented chain muxer
output-example: extend duration
ratecontrol: estimate twice the qscale values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Oct 2011 00:29:40 +0000 (02:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
w32threads: support for frame multithreading
avcodec: remove stray @deprecated comment
Conflicts:
libavcodec/utils.c
libavcodec/w32thread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 21:42:06 +0000 (23:42 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: avoid window resize crash on osx with libsdl 1.2.14
ffplay: add delay multiple times to frame_timer if it is less than current time
ffplay: remove early frame drop functionality
ffplay: calculate target clock dynamically, make code more readable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 20:32:41 +0000 (22:32 +0200)]
av_tempfile: dont try the current directory with mkstemp() unless we are on windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 20:13:20 +0000 (22:13 +0200)]
av_tempfile: change mode for fallback to 0600 to match mkstemp()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 19:32:06 +0000 (21:32 +0200)]
av_tempfile: Pass int log_offset, void *log_ctx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 19:27:20 +0000 (21:27 +0200)]
av_tempfile: fix error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 19:25:07 +0000 (21:25 +0200)]
av_tempfile: use O_EXCL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 19:24:12 +0000 (21:24 +0200)]
av_tempfile: try tempnam(NULL) first
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 15:31:33 +0000 (17:31 +0200)]
cache: add todo list
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Steven Walters [Sun, 9 Oct 2011 19:38:35 +0000 (21:38 +0200)]
w32threads: support for frame multithreading
Replace our incomplete w32threads implementation with x264's pthreads
w32threads wrapper.
Relicensed to LGPL with kind permission by Pegasys Inc.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Stefano Sabatini [Sun, 16 Oct 2011 08:35:07 +0000 (10:35 +0200)]
lavd/lavfi: compute and use the used samples buffer size for the output audio packet size
Do not assume the used size is the same of the allocated size, as it was
wrongly assumed. Fix audio playback when the two values differ.
Jean First [Wed, 12 Oct 2011 19:54:33 +0000 (21:54 +0200)]
ffplay: avoid window resize crash on osx with libsdl 1.2.14
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 9 Oct 2011 14:52:28 +0000 (16:52 +0200)]
ffplay: add delay multiple times to frame_timer if it is less than current time
If the picture queue is empty, or when the calculated delay is 0, frame_timer
is not increased but we are still displaying the old frame. When we eventually
get a frame, where the computed delay is positive, so we don't need to drop any
more frames, then it is best to update frame_timer to be as near as the current
time as it can.
This way we dont't have to wait several frames to add the necesarry delays to
frame_timer to reach current time, therefore there are no extra frame drops
after reaching a positive delay.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 9 Oct 2011 13:49:22 +0000 (15:49 +0200)]
ffplay: remove early frame drop functionality
The current impementation of early frame drops (dropping frames before adding
them to the picture queue) has multiple problems:
Even after gettin A-V sync, the frame droping continues until
VideoState->skip_frames reaches 1, which can take a lot of time causing useless
additional frame drops and bad AV-sync. This issue can be easily triggered with
for example changing the audio stream.
Also video_refresh currenly does not handle early skipped frames in every case,
for example if we skip a frame, then the last frame duration calculation will
compute the duration of the sum of the skipped frame and the duration of the
frame before that, and in compute_target_delay we may multiply this unusually
big delay.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 8 Oct 2011 19:38:53 +0000 (21:38 +0200)]
ffplay: calculate target clock dynamically, make code more readable
Since target clock is based on the current A-V delay, it is better calculate it
when we actually need it rather than when we put a picture in the picture
queue.
The patch also makes a code a bit more readable by renaming some delay
variables to duration, and converting compute_target_time to a delay
calculating function which does not modify the state. Factoring out the
iteration of the pictq to standalone function is also done in this patch.
Signed-off-by: Marton Balint <cus@passwd.hu>
Carl Eugen Hoyos [Sun, 16 Oct 2011 17:05:11 +0000 (19:05 +0200)]
Allow to overwrite input stream tags.
Mans Rullgard [Sun, 16 Oct 2011 15:16:55 +0000 (16:16 +0100)]
avcodec: remove stray @deprecated comment
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sun, 16 Oct 2011 14:54:27 +0000 (16:54 +0200)]
cache: Fallback to using the cache size for AVSEEK_SIZE if the underlaying protocol has nothing better.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 14:02:35 +0000 (16:02 +0200)]
add cache protocol
This allows backward seeking on top of some non seekable streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 13:44:31 +0000 (15:44 +0200)]
av_tempfile: handle missing O_BINARY
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 13:42:18 +0000 (15:42 +0200)]
av_tempfile: fix alloc type for !HAVE_MKSTEMP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 13:21:58 +0000 (15:21 +0200)]
Move av_tempfile() into libavutil, it is a generically usefull thing and its small.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 16 Oct 2011 15:12:53 +0000 (17:12 +0200)]
Do not warn about wrong channel layout if no channel layout is defined.
Carl Eugen Hoyos [Sun, 16 Oct 2011 08:30:24 +0000 (10:30 +0200)]
Support decoding ASP variant from QNAP Systems.
Fixes part of ticket #560.
Michael Niedermayer [Sun, 16 Oct 2011 03:04:48 +0000 (05:04 +0200)]
asf: export all the DRM stuff, some of it are human readable strings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 02:44:42 +0000 (04:44 +0200)]
asf: dont warn the user about digital sigantures, they should on their own not cause failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 02:41:11 +0000 (04:41 +0200)]
asf: export encryption information from asf.
This way user apps can choose to skip such content.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 01:44:00 +0000 (03:44 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
prores: get correct size for coded V plane if alpha is present
prores: do not set pixel format on codec init
pthread: prevent updating AVCodecContext from itself in frame_thread_free
pthread: copy coded frame dimensions in update_context_from_thread
vp8: prevent read from uninitialized memory in decode_mvs
vp8: force reallocation in update_thread_context after frame size change
vp8: fix return value if update_dimensions fails
matroskadec: fix out of bounds write
adpcmdec: calculate actual number of output samples for each decoder.
adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
adpcmdec: remove unneeded buf_size==0 check.
adpcmdec: remove unneeded zeroing of *data_size
dnxhdenc: fixed signed multiplication overflow
Conflicts:
tests/ref/fate/prores-alpha
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 00:43:36 +0000 (02:43 +0200)]
bit: require at least 1 frame for probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Oct 2011 00:38:02 +0000 (02:38 +0200)]
idf: Improve idf_probe() so it doesnt succeed on 0 byte input
JULIAN GARDNER [Fri, 14 Oct 2011 12:36:56 +0000 (14:36 +0200)]
dvbsubdec: cosmetic change on how xpos is passed around
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 15 Oct 2011 23:49:20 +0000 (01:49 +0200)]
af_ashowinfo: fix plane size computation for planar layout formats
+10l.
Stefano Sabatini [Fri, 16 Sep 2011 23:30:15 +0000 (01:30 +0200)]
af_aresample: fix properties setting in the output buffer
In particular: set output timebase to 1/output_sample_rate, fix output
PTS computation, and do not forget to copy properties values from the
input buffer.
Stefano Sabatini [Sat, 15 Oct 2011 22:44:22 +0000 (00:44 +0200)]
af_ashowinfo: adopt used plane size when computing the plane checksum
Fix checksum computation when the used plane size is different from the
allocated plane size, as it was wrongly assumed.
Michael Niedermayer [Sat, 15 Oct 2011 19:28:43 +0000 (21:28 +0200)]
dvbsubdec: Fix 0xf0 end detection
Based on a change by JULIAN GARDNER
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:54 +0000 (20:30 +0200)]
dvbsub: add comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:18 +0000 (20:30 +0200)]
dvbsub: add dvb_encode_rle8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:28:51 +0000 (20:28 +0200)]
dvbsub: Move setting of *dvb_encode_rle() up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Sat, 15 Oct 2011 18:16:31 +0000 (20:16 +0200)]
dvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if false.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 15 Oct 2011 16:28:32 +0000 (18:28 +0200)]
Support H264 from QNAP Systems.
Mans Rullgard [Sat, 15 Oct 2011 13:35:49 +0000 (14:35 +0100)]
prores: get correct size for coded V plane if alpha is present
The size check must be updated to take into account both manners
in which v_data_size might be set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 15 Oct 2011 13:35:10 +0000 (14:35 +0100)]
prores: do not set pixel format on codec init
The pixel format is not known until the frame header is parsed.
Guessing it here only causes trouble for the caller if the guess
turns out to be wrong (and actually causes very wrong output by
avconv/avplay).
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 15 Oct 2011 13:32:34 +0000 (15:32 +0200)]
h264: Workaround invalid flag combinations of 8x8 inference.
Fixes Ticket555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 14 Oct 2011 13:13:20 +0000 (15:13 +0200)]
ffprobe: add AVClass to writers
It is useful for logging messages from a writer context.
Ronald S. Bultje [Fri, 14 Oct 2011 21:47:45 +0000 (23:47 +0200)]
pthread: prevent updating AVCodecContext from itself in frame_thread_free
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:46:06 +0000 (23:46 +0200)]
pthread: copy coded frame dimensions in update_context_from_thread
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:43:29 +0000 (23:43 +0200)]
vp8: prevent read from uninitialized memory in decode_mvs
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:27:52 +0000 (23:27 +0200)]
vp8: force reallocation in update_thread_context after frame size change
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 21:21:46 +0000 (23:21 +0200)]
vp8: fix return value if update_dimensions fails
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 22:03:55 +0000 (00:03 +0200)]
matroskadec: fix out of bounds write
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Fri, 14 Oct 2011 19:56:46 +0000 (21:56 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: fix function prototypes.
prores-idct: fix overflow in c code.
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
prores: add missing feature warning for alpha
mov: 10l: Terminate string with 0 not '0'
mov: Prevent illegal writes when chapter titles are very short.
prores: add appropriate -fix_fmt parameter to FATE command
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sun, 2 Oct 2011 14:18:17 +0000 (10:18 -0400)]
adpcmdec: calculate actual number of output samples for each decoder.
This also allows for removing some of the buf_size checks and using the
sample count for some of the decoding loops.
Justin Ruggles [Sun, 2 Oct 2011 20:07:55 +0000 (16:07 -0400)]
adpcmdec: check remaining buffer size before decoding next block in the
ADPCM IMA WAV decoder.
Justin Ruggles [Sun, 2 Oct 2011 19:58:54 +0000 (15:58 -0400)]
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
There are still 2 nibbles to decode once the last byte in the packet has been
read. Updated FATE reference.
Justin Ruggles [Sun, 2 Oct 2011 18:43:28 +0000 (14:43 -0400)]
adpcmdec: remove unneeded buf_size==0 check.
This is already done by avcodec_decode_audio3()
Justin Ruggles [Sun, 2 Oct 2011 18:41:34 +0000 (14:41 -0400)]
adpcmdec: remove unneeded zeroing of *data_size
Mans Rullgard [Sat, 8 Oct 2011 00:37:20 +0000 (01:37 +0100)]
dnxhdenc: fixed signed multiplication overflow
The low 32 bits of a multiplication are the same for signed
and unsigned operands. Casting to unsigned before multiplying
is thus equivalent while avoiding signed overflow, which is
undefined by the C99 standard.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 14 Oct 2011 19:45:14 +0000 (21:45 +0200)]
proresdec: rename to avoid confusion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 14 Oct 2011 16:28:46 +0000 (09:28 -0700)]
proresdsp: fix function prototypes.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Fri, 14 Oct 2011 16:27:59 +0000 (09:27 -0700)]
prores-idct: fix overflow in c code.
Fix the fate ref for prores-422_proxy by reverting the changes to it
in commit
f492df0927c42da174edb674857670fc50abc5dc
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Fri, 14 Oct 2011 19:20:46 +0000 (21:20 +0200)]
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Fri, 14 Oct 2011 10:18:23 +0000 (12:18 +0200)]
prores: add missing feature warning for alpha
JULIAN GARDNER [Fri, 14 Oct 2011 14:41:21 +0000 (16:41 +0200)]
dvbsubdec: add version checking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:33:34 +0000 (16:33 +0200)]
dvbsubdec: handle mode change page state
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:26:38 +0000 (16:26 +0200)]
dvbsubdec: change the top_bottom correction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 14:08:06 +0000 (16:08 +0200)]
dvbsubdec: fix buf ptr in dvbsub_parse_region_segment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:49:40 +0000 (15:49 +0200)]
dvbsubdec: bottom_field_len fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:39:33 +0000 (15:39 +0200)]
dvbsubdec: fix x/y_pos checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:38:55 +0000 (15:38 +0200)]
dvbsubdec: outcomment debug stuff in dvbsub_parse_pixel_data_block()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 13:28:50 +0000 (15:28 +0200)]
dvbsubdec: dirty handkling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 14 Oct 2011 12:52:33 +0000 (14:52 +0200)]
dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 17:30:10 +0000 (19:30 +0200)]
prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Fri, 14 Oct 2011 17:38:42 +0000 (10:38 -0700)]
mov: 10l: Terminate string with 0 not '0'
Alex Converse [Thu, 13 Oct 2011 21:47:06 +0000 (14:47 -0700)]
mov: Prevent illegal writes when chapter titles are very short.
Diego Biurrun [Fri, 14 Oct 2011 14:11:32 +0000 (16:11 +0200)]
prores: add appropriate -fix_fmt parameter to FATE command
Also correct CRCs for Sequence_1-Apple_ProRes_422_Proxy.mov, previous
CRCs were generated with the non-bitexact x86_64 assembler IDCT.
Michael Niedermayer [Fri, 14 Oct 2011 12:04:29 +0000 (14:04 +0200)]
fate: enable the prores tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Brooks [Thu, 13 Oct 2011 08:34:20 +0000 (08:34 +0000)]
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
The cbSize field should be included in all cases, even with PCM where
its value is ignored.
Fixes encoding PCM audio in Matroska for some players which insist on
a full WAVEFORMATEX structure for A_MS/ACM audio.
Since fate uses wav files for the audio test a larger number of tests
has changed checksums or shifted positions due to the 2 byte longer
wave header.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Dustin Brody [Thu, 13 Oct 2011 07:26:53 +0000 (03:26 -0400)]
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Dustin Brody [Thu, 13 Oct 2011 07:26:27 +0000 (03:26 -0400)]
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 14 Oct 2011 01:43:24 +0000 (03:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
prores: add FATE tests
id3v2: reduce the scope of some non-globally-used symbols/structures
id3v2: cosmetics: move some declarations before the places they are used
shorten: remove the flush function.
shn: do not allow seeking in the raw shn demuxer.
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
avformat: update AVInputFormat allowed flags
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
truespeech: use sizeof() instead of hardcoded sizes
truespeech: remove unneeded variable, 'consumed'
truespeech: simplify truespeech_read_frame() by using get_bits()
truespeech: decode directly to output buffer instead of a temp buffer
truespeech: check to make sure channels == 1
truespeech: check for large enough output buffer rather than truncating output
truespeech: remove unneeded zero-size packet check.
mlpdec: return meaningful error codes instead of -1
mlpdec: remove unnecessary wrapper function
mlpdec: only calculate output size once
mlpdec: validate that the reported channel count matches the actual output channel count
pcm: reduce pointer type casting
...
Conflicts:
libavformat/avformat.h
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:14:09 +0000 (02:14 +0200)]
cmdutils.h: Project name cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:13:46 +0000 (02:13 +0200)]
cmdutils: Fix loglevel for -debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 23:45:13 +0000 (01:45 +0200)]
proresdec: set CODEC_CAP_DR1, it appears this was forgotten.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 19:59:04 +0000 (21:59 +0200)]
opt: handle AV_OPT_TYPE_CONST too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 23 Sep 2011 00:06:23 +0000 (02:06 +0200)]
prores: add FATE tests
Diego Biurrun [Mon, 10 Oct 2011 13:51:02 +0000 (15:51 +0200)]
id3v2: reduce the scope of some non-globally-used symbols/structures
Diego Biurrun [Mon, 10 Oct 2011 13:48:59 +0000 (15:48 +0200)]
id3v2: cosmetics: move some declarations before the places they are used
Justin Ruggles [Sat, 17 Sep 2011 02:21:47 +0000 (22:21 -0400)]
shorten: remove the flush function.
The shorten decoder does not support seeking.
Justin Ruggles [Sun, 2 Oct 2011 16:03:22 +0000 (12:03 -0400)]
shn: do not allow seeking in the raw shn demuxer.
The demuxer does not read the seektable, a parser is not possible without a
full decode, and no shorten decoder can handle random seeking because it needs
side info from the seektable.