OSDN Git Service
Paul B Mahol [Wed, 21 Aug 2013 19:27:31 +0000 (19:27 +0000)]
qtrle: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 21 Aug 2013 19:13:03 +0000 (19:13 +0000)]
qtrle: use memcpy()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 21 Aug 2013 19:03:40 +0000 (19:03 +0000)]
qtrle: use uint16_t and (u)int8_t instead of unsigned short and unsigned char
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 21 Aug 2013 18:57:30 +0000 (18:57 +0000)]
qtrle: use bytestream2_get_buffer()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 21 Aug 2013 18:34:04 +0000 (18:34 +0000)]
avcodec/mdec: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Thilo Borgmann [Wed, 21 Aug 2013 16:26:40 +0000 (18:26 +0200)]
configure: Add exif to CONFIG_EXTRA.
Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.
Stefano Sabatini [Sat, 3 Aug 2013 12:05:13 +0000 (14:05 +0200)]
doc/muxers: add elaborated example for the tee muxer
The example shows how to combine bsfs and select options.
Stefano Sabatini [Thu, 8 Aug 2013 10:11:59 +0000 (12:11 +0200)]
lavf/tee: add special select option
Paul B Mahol [Mon, 19 Aug 2013 19:09:58 +0000 (19:09 +0000)]
lavfi/hue: use lookup tables
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 21 Aug 2013 12:29:15 +0000 (14:29 +0200)]
doc/filters: move fps filter start_time item to correct place
Fixes warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 11:08:49 +0000 (13:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)]
Merge commit '
c18838f5eb7d7001a9dc653f5162868c04c1b2a1'
* commit '
c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
h264_ps: Use more meaningful error values
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 10:56:37 +0000 (12:56 +0200)]
Merge commit '
330ad1f6a53a37dec228cb424ca57e1268fafc64'
* commit '
330ad1f6a53a37dec228cb424ca57e1268fafc64':
h264_ps: K&R formatting cosmetics
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 10:32:15 +0000 (12:32 +0200)]
Merge commit '
8fed466b0a7d636ae5035f9c6074fba9a621539b'
* commit '
8fed466b0a7d636ae5035f9c6074fba9a621539b':
h264_ps: Drop commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 10:21:01 +0000 (12:21 +0200)]
Merge commit '
c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'
* commit '
c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
h264data: Move some tables to the only place they are used
Conflicts:
libavcodec/h264data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 10:12:04 +0000 (12:12 +0200)]
Merge commit '
f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'
* commit '
f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
h264data: Remove unused luma_dc_field_scan table
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 09:45:03 +0000 (11:45 +0200)]
Merge commit '
4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '
4f2b469da5e4ae221718ae479f6af627cfdebb91':
Add a libfdk-aac decoder
Conflicts:
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 09:37:10 +0000 (11:37 +0200)]
Merge commit '
545a0b807cf45b2bbc4c9087a297b741ce00f508'
* commit '
545a0b807cf45b2bbc4c9087a297b741ce00f508':
vf_fps: add 'start_time' option
Conflicts:
doc/filters.texi
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 09:18:43 +0000 (11:18 +0200)]
Merge commit '
2a61592573d725956a4377641344afe263382648'
* commit '
2a61592573d725956a4377641344afe263382648':
avcodec: Remove some commented-out debug cruft
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mvpred.h
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 08:59:02 +0000 (10:59 +0200)]
Merge commit '
6c786765cd5eb794dedd4a0970dfe689b16dfeeb'
* commit '
6c786765cd5eb794dedd4a0970dfe689b16dfeeb':
movenc: Allow chapters to be written in trailer
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 08:45:23 +0000 (10:45 +0200)]
Merge commit '
db03cb37fd9650b4a7c752d24a2e84ff27508ee8'
* commit '
db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
movenc: Allow chapter track in default MODE_MP4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Aug 2013 08:38:19 +0000 (10:38 +0200)]
Merge commit '
64af59bc4916fac5578b31c89da13c30b591bddf'
* commit '
64af59bc4916fac5578b31c89da13c30b591bddf':
avformat: Fix references to removed av_close_input_file in Doxygen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 20 Aug 2013 12:24:04 +0000 (14:24 +0200)]
avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Michael Niedermayer [Wed, 21 Aug 2013 03:46:34 +0000 (05:46 +0200)]
avformat/unix: reshuffle #includes
This should fix openbsd while hopefully also working on solaris & android
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 22:25:51 +0000 (00:25 +0200)]
avformat/unix: include sys/socket.h
unbreak android ndk r8 build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 21:18:48 +0000 (23:18 +0200)]
avcodec/flashsv: check diff_start/height
Fixes out of array accesses
Fixes Ticket2844
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 19 Aug 2013 13:18:49 +0000 (15:18 +0200)]
h264_ps: Use more meaningful error values
Diego Biurrun [Mon, 19 Aug 2013 13:16:05 +0000 (15:16 +0200)]
h264_ps: K&R formatting cosmetics
Diego Biurrun [Mon, 19 Aug 2013 13:22:06 +0000 (15:22 +0200)]
h264_ps: Drop commented-out cruft
Diego Biurrun [Mon, 19 Aug 2013 10:44:58 +0000 (12:44 +0200)]
h264data: Move some tables to the only place they are used
Diego Biurrun [Mon, 19 Aug 2013 10:43:17 +0000 (12:43 +0200)]
h264data: Remove unused luma_dc_field_scan table
Martin Storsjö [Thu, 15 Aug 2013 19:40:32 +0000 (15:40 -0400)]
Add a libfdk-aac decoder
This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.
Justin Ruggles [Thu, 15 Aug 2013 20:14:57 +0000 (16:14 -0400)]
vf_fps: add 'start_time' option
This allows for dropping or duplication to match a particular start time.
Diego Biurrun [Tue, 20 Aug 2013 12:25:33 +0000 (14:25 +0200)]
avcodec: Remove some commented-out debug cruft
Thilo Borgmann [Tue, 20 Aug 2013 13:53:42 +0000 (15:53 +0200)]
fate: Add EXIF test.
Michael Niedermayer [Tue, 20 Aug 2013 14:56:51 +0000 (16:56 +0200)]
swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output
Fixes Ticket2859
Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
work before ...)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 14:49:31 +0000 (16:49 +0200)]
swr: clean layouts before checking sanity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Mon, 19 Aug 2013 23:05:30 +0000 (16:05 -0700)]
movenc: Allow chapters to be written in trailer
This allows creation of frame accurate chapter marks from sources
like DVD and BD where the precise chapter location is not known until
the chapter mark has been reached during reading.
Signed-off-by: Martin Storsjö <martin@martin.st>
John Stebbins [Mon, 19 Aug 2013 23:05:29 +0000 (16:05 -0700)]
movenc: Allow chapter track in default MODE_MP4
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 20 Aug 2013 11:45:20 +0000 (13:45 +0200)]
movenc: ilbc needs audio_vbr set.
Without this the block_align or bitrate value is not available to the decoder
Fixes Ticket2858
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 20 Aug 2013 10:23:24 +0000 (12:23 +0200)]
avformat: Fix references to removed av_close_input_file in Doxygen
Michael Niedermayer [Tue, 20 Aug 2013 10:48:52 +0000 (12:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Prevent segfaults on mov_write_hdlr_tag
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 10:25:28 +0000 (12:25 +0200)]
Merge commit '
22de0f8369f1f3edf1a55e1d275f3c07c617b53e'
* commit '
22de0f8369f1f3edf1a55e1d275f3c07c617b53e':
mov: Compute max duration among the tracks with a timescale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 10:16:31 +0000 (12:16 +0200)]
Merge commit '
39523030108815242178ac5e209c83070bd1baef'
* commit '
39523030108815242178ac5e209c83070bd1baef':
mov: Set the timescale for data streams
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 09:44:25 +0000 (11:44 +0200)]
Merge commit '
b886f5c2f1e71b3e60e4265c500158d392b4b9a4'
* commit '
b886f5c2f1e71b3e60e4265c500158d392b4b9a4':
mkv: Allow flushing the current cluster in progress
Conflicts:
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 09:30:46 +0000 (11:30 +0200)]
Merge commit '
59f595921eb2b848a80a74aa81b6bb43038c9ebe'
* commit '
59f595921eb2b848a80a74aa81b6bb43038c9ebe':
mkv: Flush the old cluster before writing a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 09:15:11 +0000 (11:15 +0200)]
Merge commit '
98308bd44face14ea3142b501d16226eec23b75a'
* commit '
98308bd44face14ea3142b501d16226eec23b75a':
mkv: Add options for specifying cluster limits
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 09:05:02 +0000 (11:05 +0200)]
Merge commit '
148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'
* commit '
148fbdd1c2a2a88a78ba9fd152c81c840bdb205a':
mkv: Refactor mkv_write_packet
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Aug 2013 01:30:36 +0000 (03:30 +0200)]
ffv1: rename minor to micro version
the version is 1.3.4 which makes 4 micro and not minor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 19 Aug 2013 15:18:23 +0000 (17:18 +0200)]
mov: Prevent segfaults on mov_write_hdlr_tag
Do not segfault when writing tracks such as tmcd by writing them down
as generic DataHandlers if not known.
Luca Barbato [Mon, 19 Aug 2013 15:18:22 +0000 (17:18 +0200)]
mov: Compute max duration among the tracks with a timescale
Prevent an assert.
Luca Barbato [Mon, 19 Aug 2013 15:18:21 +0000 (17:18 +0200)]
mov: Set the timescale for data streams
Data streams have a defined timebase, do not ignore it.
Michael Niedermayer [Mon, 19 Aug 2013 22:14:24 +0000 (00:14 +0200)]
mpegvideo: Use picture_ptr instead of picture in ff_mpeg_draw_horiz_band()
Fixes strides and issue with mplayer and mpeg2 field pictures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 19 Aug 2013 07:33:14 +0000 (08:33 +0100)]
mkv: Allow flushing the current cluster in progress
Allow emitting the current cluster that is being written before
starting a new one, simplifying how to figure out where clusters
are positioned in the output stream (for live streaming).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 18 Aug 2013 18:09:41 +0000 (20:09 +0200)]
mkv: Flush the old cluster before writing a new one
This simplifies keeping track of cluster boundaries for e.g.
livestreaming of WebM.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 18 Aug 2013 18:09:40 +0000 (20:09 +0200)]
mkv: Add options for specifying cluster limits
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Matthew Heaney [Thu, 8 Aug 2013 22:40:03 +0000 (15:40 -0700)]
avformat/matroskadec: add WebVTT support
WebM files now support inband text tracks, as described in the
following specification:
http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
The Matroska demuxer now detects the presence of WebVTT tracks,
synthesizing WebVTT packets (having codec id AV_CODEC_ID_WEBVTT) and
pushing them downstream in the normal way.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 19 Aug 2013 10:45:32 +0000 (12:45 +0200)]
swscale: improve dither checks
Bssed on patch by Øyvind Kolås <pippin@gimp.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 19 Aug 2013 16:29:40 +0000 (18:29 +0200)]
swscale: set dither to a specific value for rgb/bgr8 output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 18 Aug 2013 18:09:39 +0000 (20:09 +0200)]
mkv: Refactor mkv_write_packet
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stephen Hutchinson [Mon, 19 Aug 2013 03:15:08 +0000 (23:15 -0400)]
Revert "doc/RELEASE_NOTES: add a note about AVISynth"
This reverts commit
3aa2257d240a5a0eb94014b9113dd91730786886.
Paul B Mahol [Mon, 19 Aug 2013 09:41:18 +0000 (09:41 +0000)]
matroskaenc: remove unneeded wavpack tag
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 19 Aug 2013 09:11:14 +0000 (11:11 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ogg: Fix potential infinite discard loop
No change as this commit has been part of ffmpeg since a while already
See:
d7b542ae294aaf818f2a00c5606e009cf931e77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 18 Aug 2013 15:40:51 +0000 (17:40 +0200)]
ogg: Fix potential infinite discard loop
Seeking in certain broken files would cause ogg_read_timestamp
to fail because ogg_packet would go into a state where all packets
of stream 1 would be discarded until the end of the stream.
Bug-Id: 553
CC: libav-stable@libav.org
Signed-off-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Carl Eugen Hoyos [Sun, 18 Aug 2013 21:37:27 +0000 (23:37 +0200)]
Fix frame width and height for some targa_y216 samples.
Fixes ticket #2864.
Michael Niedermayer [Sun, 18 Aug 2013 20:59:04 +0000 (22:59 +0200)]
avformat/mpegts: resync from the smallest packet size on
This avoids the loss of a packet in many cases if the packet size was wrong.
It also improves detection of packet size changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 20:31:19 +0000 (22:31 +0200)]
mpegts_get_pcr: dont loose a packet when resyncing
This matches how read_packet() works
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 20:10:41 +0000 (22:10 +0200)]
mpegts: fix pos47_full
The value was off by a packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 19:30:19 +0000 (21:30 +0200)]
avformat/mpegts: print packet size warning only if new size differs from old
No case is known to have triggered this, but its more correct to check that the
new size differs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 18 Aug 2013 20:00:35 +0000 (22:00 +0200)]
Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding.
Fixes ticket #2870.
Michael Niedermayer [Sun, 18 Aug 2013 16:44:12 +0000 (18:44 +0200)]
avcodec/jpeg2000dec: fix near null pointer dereference
Fixes Ticket2840
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 14:35:38 +0000 (16:35 +0200)]
mpegts: reanalyze packet size on mismatches
Fixes Ticket1812
Fixes Ticket2838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 12:20:16 +0000 (14:20 +0200)]
avcodec/error_resilience: Fix handling of matrox mpeg2
Fixes Ticket2615
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 11:55:57 +0000 (13:55 +0200)]
mpeg12dec: also print progressive seq and chroma format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 10:43:11 +0000 (12:43 +0200)]
fate: add ffv1.0 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 10:01:08 +0000 (12:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Indicate that negative timestamps are supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 09:50:47 +0000 (11:50 +0200)]
Merge commit '
c34a96a5ddfa390ce2a352eca79190766c9056d4'
* commit '
c34a96a5ddfa390ce2a352eca79190766c9056d4':
dxa: fix decoding of first I-frame by separating I/P-frame decoding
Conflicts:
libavcodec/dxa.c
See:
186e47ef6d7d90bfd8b16e77cfa5e7aeb2a497c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 Aug 2013 00:20:54 +0000 (02:20 +0200)]
avformat/matroskadec: check out_samplerate before using it in av_rescale()
Prevent assertion failure with damaged input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 17 Aug 2013 17:48:33 +0000 (14:48 -0300)]
matroskadec: Improve TTA duration calculation
Calculate the duration as accurately as possible to improve decoding of samples
where the last frame is smaller than the rest.
Example:
Take lossless-audio/luckynight-partial.tak from the FATE suit and convert it
to TTA muxed into matroska:
ffmpeg -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -c:a tta lucky.mka
The framemd5 output for lucky.mka without this patch:
0, 0, 0, 46080, 184320,
7c3751ddd571d2903c3cf0ab4b3e3d0a
0, 46080, 46080, 46080, 184320,
6b70c782ba1da3f933fde2daa4f96b73
0, 92160, 92160, 46080, 184320,
dcf70d89c54b9a4f0b302d4ec4fb302d
0, 138240, 138240, 46080, 184320,
48713ca38b388d2ea4abf5b86ed1226f
0, 184320, 184320, 46080, 184320,
12188a23648e7ebfb07cd6fe9197b2ea
0, 230400, 230400, 46080, 184320,
49653ab8186a5d4a044ed284671a26e0
0, 276480, 276480, 46080, 184320,
5e82c6a7fe58c7ea612c03a0a2927dd4
0, 322560, 322560, 46080, 184320,
83dc449dbd9eab5f2e8ad2b4403d6a21
0, 368640, 368640, 46080, 184320,
bdd6b92c23d30978d4e802d305b0fc49
With this patch:
0, 0, 0, 46080, 184320,
7c3751ddd571d2903c3cf0ab4b3e3d0a
0, 46080, 46080, 46080, 184320,
6b70c782ba1da3f933fde2daa4f96b73
0, 92160, 92160, 46080, 184320,
dcf70d89c54b9a4f0b302d4ec4fb302d
0, 138240, 138240, 46080, 184320,
48713ca38b388d2ea4abf5b86ed1226f
0, 184320, 184320, 46080, 184320,
12188a23648e7ebfb07cd6fe9197b2ea
0, 230400, 230400, 46080, 184320,
49653ab8186a5d4a044ed284671a26e0
0, 276480, 276480, 46080, 184320,
5e82c6a7fe58c7ea612c03a0a2927dd4
0, 322560, 322560, 46080, 184320,
83dc449dbd9eab5f2e8ad2b4403d6a21
0, 368640, 368640, 46080, 184320,
bdd6b92c23d30978d4e802d305b0fc49
0, 414720, 414720, 4230, 16920,
b50b440c5bbcecb8e9fbece643447593
The duration without this patch was calculated as
418950000000, which is bigger
than uint32_t and as such stored as
2338172288.
With this patch the duration is correctly calculated as 418950.
Signed-off-by: James Almer <jamrial@gmail.com>
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 17 Aug 2013 22:25:49 +0000 (22:25 +0000)]
wavpackenc: do not copy samples if they are not available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vignesh Venkatasubramanian [Fri, 16 Aug 2013 18:08:06 +0000 (11:08 -0700)]
lavf/matroska: Adding the new SeekPreRoll element
In order to encapsuate Opus in Matroska, there is a new element
that has been added to the Matroska Spec, SeekPreRoll. It has the
duration in nanoseconds that has to be decoded before every seek.
Spec: http://matroska.org/technical/specs/index.html#SeekPreRoll
Proposal for encapsulateing Opus in Matroska:
http://wiki.xiph.org/MatroskaOpus
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 17 Aug 2013 16:05:53 +0000 (17:05 +0100)]
movenc: Indicate that negative timestamps are supported
The mov/mp4 muxer has support for handling negative timestamps
via edit lists (which customarily is used for handling the 1-frame
delay due to B-frames as well).
Using the muxer's native way of handling it is better than using
the generic offsetting. The generic offsetting is a bit too
crude when e.g. the timebase of one track is 1/fps, where the
edit lists can handle it accurately.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 17 Aug 2013 13:49:59 +0000 (15:49 +0200)]
avcodec: fix compilation without vdpau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Aug 2013 13:31:14 +0000 (15:31 +0200)]
Revert "Merge commit of 'vdpau: remove old-style decoders'"
This reverts commit
bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing
changes made to
b7fc2693c70fe72936e4ce124c802ac23857c476.
Conflicts:
libavcodec/h264.c
Keeping support for the old VDPAU API has been requested by our VDPAU maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Aug 2013 12:30:10 +0000 (14:30 +0200)]
avcodec/dxa: Support printing picture debug info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Fri, 16 Aug 2013 21:29:55 +0000 (17:29 -0400)]
avisynth: Support video input from AviSynth 2.5 properly.
Uses the 2.5 compatibility header included with the variant of
FFMS2 that uses AviSynth's C-interface. A copy of this header is
now provided in compat/avisynth.
avs_get_row_size_p and avs_get_height_p changed between versions
2.5 and 2.6. Since the avisynth_c.h header that avformat uses
assumes AviSynth 2.6, it would cause 2.5 to crash if given any
kind of real video (the Version() function was known to work,
though).
AvxSynth was unaffected by this issue because, despite being based
on AviSynth 2.5.8 and using 2.5.8's interface version number of 3,
it actually uses 2.6's versions of these functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sat, 17 Aug 2013 10:36:36 +0000 (12:36 +0200)]
dxa: fix decoding of first I-frame by separating I/P-frame decoding
5ef7c84 broke decoding for the first keyframe due to an unnecessary
check for a reference frame.
CC: libav-stable@libav.org
Michael Niedermayer [Sat, 17 Aug 2013 09:12:47 +0000 (11:12 +0200)]
dxa: fix support of decoding all frames even in the absence of references
The case where decoding should only happen for keyframes and afterwards
(CODEC_FLAG2_SHOW_ALL not set) does not fully work neither before nor
after this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Aug 2013 09:11:45 +0000 (11:11 +0200)]
dxa: only fail with an error about reference frames if the reference frame would be used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Aug 2013 08:36:19 +0000 (10:36 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxa: Make sure the reference frame exists
See:
12eb2fd5394813a6119912b22f5dfc17b4a6b4a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Aug 2013 08:30:38 +0000 (10:30 +0200)]
Merge commit '
c59967fa7cc5bc2fa06b36c17d2c207240c06b3e'
* commit '
c59967fa7cc5bc2fa06b36c17d2c207240c06b3e':
h261: check the mtype index
Conflicts:
libavcodec/h261dec.c
The right half of the check is impossible to be true and thus replaced by
an assert()
See:
ec3cd74f2dab8e3e8234ccb994132b23d3098585
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 23:41:31 +0000 (01:41 +0200)]
ffv1: update years in header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 23:38:53 +0000 (01:38 +0200)]
ffv1enc: propagate error code from write_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 23:38:32 +0000 (01:38 +0200)]
ffv1enc: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 5 Jul 2013 16:33:30 +0000 (18:33 +0200)]
lavf/tee: add support for bitstream filtering
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
Michael Niedermayer [Fri, 16 Aug 2013 13:56:10 +0000 (15:56 +0200)]
avcodec/dirac_dwt: Remove unused ff_spatial_idwt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:55:19 +0000 (15:55 +0200)]
avfilter/vf_mp: remove unused sws related functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:35:00 +0000 (15:35 +0200)]
avfilter: remove ff_copy_int*_list
The functions are unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:01:47 +0000 (15:01 +0200)]
swscale: change ff_dither_8x8_128 dimensions to be consistent with the others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 14 Aug 2013 14:51:53 +0000 (16:51 +0200)]
dxa: Make sure the reference frame exists
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org