Michael Niedermayer
482c1ac849
Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
...
* commit '13f57a4d881ec669b87bf82f424bfff502433060':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:06:27 +02:00
Luca Barbato
13f57a4d88
wav: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-02 19:04:22 +02:00
Michael Niedermayer
fd68371b07
nutdec: Implement duration parsing for indexed nuts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 18:57:29 +02:00
Michael Niedermayer
0beff42823
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 12:49:23 +02:00
Luca Barbato
0671adbb18
id3v2: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-02 11:02:45 +02:00
Michael Niedermayer
d602f16a37
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 20:16:26 +02:00
Michael Niedermayer
a5ba4e186b
Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
...
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:28:48 +02:00
Nicolas George
276fcbde6c
lavf: data muxer and demuxer.
...
Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).
2013-05-01 11:56:34 +02:00
Diego Biurrun
e926b5ceb1
avformat: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:16:23 +02:00
Michael Niedermayer
147a45fca4
framecrcenc: workaround design flaw in sidedata palette
...
This should be reverted once palettes are dealt with in a endian independant way
in packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 13:35:14 +02:00
Carl Eugen Hoyos
00a61ac755
Recognize j2k as file suffix for the image2 muxer.
2013-04-29 13:11:32 +02:00
Michael Niedermayer
2ac6d6b7cd
Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'
...
* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
oma: K&R formatting cosmetics
Conflicts:
libavformat/omadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 12:18:18 +02:00
Michael Niedermayer
54056c1493
Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'
...
* commit 'cf679b9476727a237c8006c685ace18acba149ab':
hls, segment: fix splitting for audio-only streams.
Conflicts:
libavformat/hlsenc.c
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 11:48:40 +02:00
Michael Niedermayer
0fb64da63f
avformat: Add black ops audio demuxer
...
Fixes Ticket2064
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 04:21:29 +02:00
Luca Barbato
c140105410
oma: K&R formatting cosmetics
2013-04-27 10:53:24 +02:00
Anton Khirnov
cf679b9476
hls, segment: fix splitting for audio-only streams.
...
CC:libav-stable@libav.org
2013-04-27 10:19:04 +02:00
Michael Niedermayer
ba323d67fa
avformat/write_packet: drop disabled code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:57:56 +02:00
Michael Niedermayer
eba33396f0
avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer
...
This changes the default to avoid negative timestamps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
e5891a2337
avformat/movenc: mov/mp4 should support negative timestamps through edit lists
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
647f306b46
avformat/mux: assert that timestamps are positive after offsetting them
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
c329195a27
avformat/mux: use a local variable for offset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
060f14f493
avformat/mux: change avoid_negative_ts code to support later addition of AVStreams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
c4bf740225
Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'
...
* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
lavf: introduce AVFMT_TS_NEGATIVE
Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts
This commit does not change the default ts behaviour, such
change will, if its done, be done separately.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 10:59:45 +02:00
Luca Barbato
c2cb01d418
lavf: introduce AVFMT_TS_NEGATIVE
...
Most formats do not support negative timestamps, shift them to avoid
unexpected behaviour and a number of bad crashes.
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-04-25 10:13:27 +02:00
Carl Eugen Hoyos
9526c9ccc3
Read block_align from extradata when decoding qclp in aiff.
...
Fixes ticket #1287 .
2013-04-23 16:19:26 +02:00
Paul B Mahol
ad56535dd1
avformat: fix orig_pos type to match pkt->pos
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-23 13:56:34 +00:00
Michael Niedermayer
74e1aa17df
Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'
...
* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a':
mxfenc: Use correct printf format specifier for int64_t
h264: Drop unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 18:33:37 +02:00
Michael Niedermayer
645d0384e8
Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
...
* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
riff: Factor out WAVEFORMATEX parsing
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 12:53:58 +02:00
Michael Niedermayer
05deb05fe9
Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
...
* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 12:36:29 +02:00
Michael Niedermayer
52e40155a8
Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
...
* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
riff: Move guid structs and helper functions into riff
Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 12:20:04 +02:00
Diego Biurrun
a0d5ca4f0a
mxfenc: Use correct printf format specifier for int64_t
...
libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]
2013-04-22 12:05:09 +02:00
Michael Niedermayer
369e5dcfc5
Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'
...
* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0':
riff: check for eof if chunk size and code are 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 11:46:22 +02:00
Michael Niedermayer
e381cc3e4e
Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'
...
* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
riff: K&R formatting cosmetics
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 10:50:05 +02:00
Luca Barbato
b845f5e97b
riff: Factor out WAVEFORMATEX parsing
...
Makes the code simpler to follow.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:30 +02:00
Peter Ross
a3bf80a5ae
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:30 +02:00
Peter Ross
e544782623
riff: Move guid structs and helper functions into riff
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:30 +02:00
Luca Barbato
8e329dba37
riff: check for eof if chunk size and code are 0
...
Prevent an infinite loop.
Inspired by a patch from Michael Niedermayer
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:30 +02:00
Peter Ross
516089d5d8
riff: Add ACTRAC3+ guid
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:30 +02:00
Luca Barbato
1c88617b94
riff: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21 18:20:12 +02:00
Michael Niedermayer
578d9cf7cc
mxf_timestamp_to_str: dont leave uninitilaized fields in time.
...
Fixes CID1005318
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 00:26:20 +02:00
Clément Bœsch
67cc31d6c7
lavf/gif: add final_delay option.
2013-04-20 00:11:04 +02:00
Clément Bœsch
a16c20569d
lavf/gifdec: add loop support.
...
Loop is ignored by default.
2013-04-20 00:05:35 +02:00
Michael Niedermayer
194d0399a2
Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'
...
* commit '505642f18276aed03278ac91b1f334ea888eac6a':
mp3dec: fallback to generic seeking when a TOC is not present
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 21:36:23 +02:00
Michael Niedermayer
833bc6678f
avformat: change seeking index consistency asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 17:44:07 +02:00
Clément Bœsch
30e6a02c23
lavf/http: remove duplicated dec flag.
2013-04-19 14:44:58 +02:00
Clément Bœsch
6189ff3679
lavf/gif: avoid forward declaration.
2013-04-19 12:11:10 +02:00
Clément Bœsch
a7c5b7a676
lavf/gif: correct the delay after the first frame.
...
To define accurately the delay between two frames, it is necessary to
have both available. Before this commit, the first frame had a delay of
0; while in practice the problem is not visible in most situation, it is
problematic with low frame rate and large scene change.
This commit notably fixes output generated with commands such as:
ffmpeg -i big_buck_bunny_1080p_h264.mov
-vf "select='gt(scene,0.4)',scale=320:-1,setpts=N/TB"
-frames:v 5 -y out.gif
Also, to avoid odd loop delays, the N-1 delay is duplicated for the last
frame.
2013-04-19 12:02:19 +02:00
Michael Niedermayer
505642f182
mp3dec: fallback to generic seeking when a TOC is not present
...
Fixes seeking without a Xing/Info header.
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-19 09:26:34 +02:00
Clément Bœsch
7e57adb464
lavf/gif: fix timing.
...
pkt->duration can not be used since the values are only based on frame
rate.
2013-04-19 02:15:57 +02:00
Clément Bœsch
13478b270a
gif: use only one graphic control extension block per image.
...
The encoder now doesn't produce any extra graphic control extension
block anymore. Only the image is encoded, and the muxer writing
its own GCE containing notably the timing information now includes the
optional palette transmitted through packet side data.
This commit avoid setting clashes between the two GCE, and reduce the
size of the generated file with pal8 output.
2013-04-19 02:10:59 +02:00