generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,923 Commits 24 Branches 241 Tags 173 MiB
8d07bbca63
Commit Graph

11895 Commits

Author SHA1 Message Date
Justin Ruggles
935fbb66ef wtv: set channel layout for mpeg audio 2012-11-12 10:33:23 -05:00
Justin Ruggles
7b48d93e8a westwood_aud: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
2ce7f820d4 wc3movie: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a94b0267f2 tmv: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
7f348bd764 tiertexseq: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a3949fe11f swfdec: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
1c7587728c sol: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
bfccd76adb smacker: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
57e590e4b8 siff: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a634896cf8 sierravmd: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
c1ac602d53 rtpdec_amr: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
ce842029ce rsodec: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
60a585304c rmdec: set channel layout for RA version 3 2012-11-12 10:33:21 -05:00
Justin Ruggles
444b79c18a qcp: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
b5e3e77711 psxstr: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
c9759eb426 omadec: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
ef1b23ad21 jvdec: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
d4088efbe2 oggparsespeex: validate channel count and set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
4371131283 iss: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
232e9c4c4b nuv: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
cc57228e31 mxg: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
66d7ceb4aa mvi: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
f6c6e5aac1 mpc7: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
f24b0b1b6c mmf: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
87199d34db mm: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
41a2d9590d ipmovie: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
024e03701c iff: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
73e2007f3d idroqdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
f6c3adde41 gxfdec: set channel layout when applicable 2012-11-12 10:33:19 -05:00
Justin Ruggles
d4a105ae5c gsmdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
644d8d2e5a flvdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
d5ca70b103 dv: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
49e7af06f2 dsicin: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
a05a63785c daud: set channel layout 
Update FATE reference due to WAVE channel mask now being set correctly.
 2012-11-12 10:33:18 -05:00
Justin Ruggles
0d09a5848f cdxl: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
e8088d6e4b bmv: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
2fe804f316 bink: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
ff50d27a63 bfi: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
b5d1a15d1b bethsoftvid: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
39f0e9b8c6 apc: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
5595368bcc amr: set channel_layout 2012-11-12 10:33:18 -05:00
Michael Niedermayer
03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-12 11:32:11 +01:00
Clément Bœsch
3704804c8f lavf/assenc: add non strict ts flag. 
ASS can have several events at the same time.
 2012-11-11 22:58:56 +01:00
Michael Niedermayer
5aedee4fac gxf: avoid null ptr deref without streams. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 20:58:04 +01:00
Justin Ruggles
a903f8f087 Include libavutil/channel_layout.h instead of libavutil/audioconvert.h 
Also reorder some other #include when applicable.
 2012-11-11 13:35:12 -05:00
Michael Niedermayer
192db16b9c segafilm: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 18:32:46 +01:00
Michael Niedermayer
f1d6f013b2 omadec: fix len check in nprobe() prevent out of array access 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 18:16:48 +01:00
Peter Ross
6f78ba8b0b electronic arts: support rare samples containing adpcm_ea_r1 audio 
Fixes ticket #1549.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:52:02 +01:00
Peter Ross
d168fcb68f electronicarts: use av_log_ask_for_sample 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:51:16 +01:00
Michael Niedermayer
d7da4d47a6 mxfdec: avoid double free and leaks. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 02:20:04 +01:00
Michael Niedermayer
c2ca0163af matroskadec: check h in generic rm packet shuffler 
Fixes crash

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 01:19:44 +01:00
Clément Bœsch
e56b098410 lavf/srtenc: ignore invalid timed packets instead of failing. 
This way we don't abort in the middle of remuxing, just warn about an
event ignored. The index increment is moved to make sure the output
numbers still make sense.
 2012-11-10 22:43:27 +01:00
Michael Niedermayer
eb3dc23705 mov: Make sure no streams after the header lack a timescale. 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:29:23 +01:00
Piotr Bandurski
cc5c2ef09d riff: add SMV2 FourCC for H264 
sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:16:14 +01:00
Carl Eugen Hoyos
b56ff0b261 Allow forcing a frame size in bytes for image2pipe. 
This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.

Fixes ticket #1869.
 2012-11-10 02:25:17 +01:00
Carl Eugen Hoyos
f91f049a22 Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder. 
Reviewed-by: Paul B Mahol
 2012-11-10 02:19:55 +01:00
Piotr Bandurski
49c2f2d57e riff: add GXVE FourCC for WMV2 
sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 01:58:51 +01:00
Michael Niedermayer
c63e76ba35 ebml_read_binary: use fast_padded_malloc() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 23:35:58 +01:00
Michael Niedermayer
e481ba2ed7 vqf: check samplerate, avoid division by 0. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 18:05:19 +01:00
Michael Niedermayer
7989f7e0b5 xmv: Fix integer overflow 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 17:18:01 +01:00
Michael Niedermayer
7ec1fe1f47 lavf: Dont compare absolute to relative timestamps in duration gcd 
This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 14:59:43 +01:00
Michael Niedermayer
1b5a6d3c49 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flacenc: ensure the order is within the min/max range in LPC order search
  avconv: rescale packet duration to muxer time base when flushing encoders
  add 24-bit FLAC encoding to Changelog
  rtpenc_aac: Fix calculation of the header size
  x86: h264_intrapred: port to cpuflags

Conflicts:
	Changelog
	libavformat/rtpenc_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 10:29:51 +01:00
Luca Abeni
e004d175fe rtpenc_aac: Fix calculation of the header size 
Previously the high end byte was always set to zero. Also get
rid of an unnecessary multiplication (which in practice couldn't
overflow) before shifting.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-08 19:48:32 +02:00
Michael Niedermayer
5ff43ec72d sctp: silence const warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 16:06:04 +01:00
Michael Niedermayer
60e028958c ffmdec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 15:54:14 +01:00
Luca Abeni
78e08fd340 rtpenc_aac: Fix 10l bug 
Fixes CID602564
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 01:54:16 +01:00
Peter Ross
a373f35272 wtvenc: produce seekable files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:59:03 +01:00
Peter Ross
b89cd2a028 wtvenc: simplify write_timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:51:38 +01:00
Peter Ross
3e65134326 wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:45:01 +01:00
Peter Ross
0d9435048c wtvenc: indent fixup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:44:50 +01:00
Peter Ross
b50759cd6b wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:42:01 +01:00
Paul B Mahol
7c2cfaac6a smjpegenc: use bits_per_coded_sample instead of calling function 
Final result is same and this allows support of multiple values per codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-07 01:31:39 +00:00
Nicolas George
e9b8523d52 sbgdec: dont set slide to a uninitialized value 
Fixed CID703833
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 21:46:22 +01:00
Michael Niedermayer
2ca649f177 utils: fix integer overflow with DURATION_MAX_READ_SIZE 
Fixes CID703746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 18:44:14 +01:00
Peter Ross
e6ef628b1e wtv: move duplicated guids into wtv.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:52:33 +01:00
Peter Ross
1701a22fce wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:51:41 +01:00
Peter Ross
9632f5efcf wtvenc: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:50:36 +01:00
Michael Niedermayer
2a0dfc51ea img2enc: support 16bit per sample yuv in split planes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 02:27:04 +01:00
Michael Niedermayer
2c87565147 img2enc: support storing alpha planes too in split plane mode 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:42:26 +01:00
Michael Niedermayer
db012e161e img2enc: Fix yuva with yuv split planes. 
Previously the chroma planes where corrupted in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
67ee2d2f6d img2enc: check pix_fmt for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
6dfcc7abdd img2enc: ensure that the codec is rawvideo for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
7d26be63c2 Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
	doc/APIchanges
	libavutil/version.h
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 22:51:20 +01:00
Martin Storsjö
f0615557e0 rtmpproto: Use av_strlcat instead of strncat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.
 2012-11-05 21:47:43 +01:00
Paul B Mahol
70727e8774 lavf/avr: make .long_name consistent with others 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 20:47:22 +00:00
Michael Niedermayer
282a6308bf udp: check ff_socket_nonblock() return code 
Fixes CID733719
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 21:21:04 +01:00
Diego Biurrun
92fec47d69 build: The A64 muxer depends on rawenc.o for ff_raw_write_packet() 2012-11-05 20:48:50 +01:00
Michael Niedermayer
30d27685b1 segment: fix null ptr deref 
Fixes CID732220
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 20:26:10 +01:00
Paul B Mahol
962314fe27 AVR demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 17:31:22 +00:00
Piotr Bandurski
461797f6aa riff: add "lsvm" FourCC for H263. 2012-11-05 17:43:01 +01:00
Michael Niedermayer
9829ec1a9c ffm: redesign header format to make it extensible 
Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 16:36:44 +01:00
Martin Storsjö
d578f94746 rtmp: Use av_strlcat instead of strncat 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-05 15:37:09 +02:00
Clément Bœsch
a8b3130181 lavf/srtdec: recognize subtitles starting at event index 0. 2012-11-05 07:37:45 +01:00
Michael Niedermayer
e82afa3e2d filmstripenc: fix rounding that caused fate failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 00:28:21 +01:00
Michael Niedermayer
a147c1b2b1 oggenc: remove unneeded null check. 
The code would have segfaulted before if it where null

Fixes CID732218
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 00:28:21 +01:00
Paul B Mahol
992a6a53ef cdxl: add read_probe function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 20:19:43 +00:00
Paul B Mahol
c4dd4f19f3 smush: improve probing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 16:50:58 +00:00
Paul B Mahol
50d3a1a962 vocenc: fix 10l regression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 04:46:10 +00:00
Paul B Mahol
1c5b56eec7 vocenc: abort if unsupported codec is used 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 03:59:08 +00:00
Michael Niedermayer
5f53138621 movenc: remove unneeded check 
Fixes CID741417
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-04 01:03:52 +01:00
Paul B Mahol
94f224516c westwood_aud: remove stale comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-03 14:54:17 +00:00
Michael Niedermayer
2581d9bcbb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
	doc/Makefile
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:48:51 +01:00
Michael Niedermayer
37e81996dc Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
  lavf: fix av_interleaved_write_frame() doxy.
  lavf: clarify the lifetime of demuxed packets.
  avconv: do not free muxed packet on streamcopy.
  crc: move doxy to the header
  vf_drawtext: do not use deprecated av_tree_node_size
  x86: Refactor PSWAPD fallback implementations and port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:24:11 +01:00
Michael Niedermayer
b7280cff9a asfdec: check stream_index for validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:58:12 +01:00
Michael Niedermayer
e5927910c2 asfdec: flip the interpretation of the header aspect back 
This reverts 2de8877689

Fixes Ticket 1883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:49:07 +01:00
Michael Niedermayer
343c73e252 asfdec: parse aspect ratio payload extension 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:49:07 +01:00
Michael Niedermayer
8c93269e42 asfdec: correctly parse payload extensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:37:18 +01:00
Michael Niedermayer
2d8c76eb1f asfdec: parse payload extension list 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:35:35 +01:00
Anton Khirnov
9221efef79 lavf: fix av_interleaved_write_frame() doxy. 
A sentence was mistakenly inserted in the middle of another sentence.
 2012-11-02 18:28:56 +01:00
Anton Khirnov
34871beb5e matroskadec: do not use avpacket internals 2012-11-02 18:28:56 +01:00
Anton Khirnov
717a450993 lavf: clarify the lifetime of demuxed packets. 2012-11-02 18:28:56 +01:00
Paul B Mahol
c39fb30816 smjpegdec: set nb_frames for video stream 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-02 16:32:51 +00:00
Michael Niedermayer
8551c6bec0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dv1394: Swap the min and max values of the 'standard' option
  rtpdec_vp8: Don't parse fields that aren't used
  lavc: add some AVPacket doxy.
  audiointerleave: deobfuscate a function call.
  rtpdec: factorize identical code used in several handlers
  a64: remove interleaved mode.
  doc: Point to the new location of the c99-to-c89 tool
  decode_audio3: initialize AVFrame
  ws-snd1: set channel layout
  wmavoice: set channel layout
  wmapro: use AVCodecContext.channels instead of keeping a private copy
  wma: do not keep private copies of some AVCodecContext fields

Conflicts:
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 14:57:36 +01:00
Martin Storsjö
2b831a59d9 rtpdec_vp8: Don't parse fields that aren't used 
This avoids warnings about unused variables.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-02 10:59:17 +02:00
Anton Khirnov
fdc8672886 audiointerleave: deobfuscate a function call. 
right above there is if (pkt) {<do stuff>; pkt = NULL}, so pkt is just a
fancy name for NULL at this point.
 2012-11-02 07:58:38 +01:00
Anton Khirnov
179a5c37e0 rtpdec: factorize identical code used in several handlers 2012-11-02 07:58:37 +01:00
Anton Khirnov
f70381ab9d a64: remove interleaved mode. 
It has been disabled since it was added two years ago.
 2012-11-02 07:58:37 +01:00
Jason
a5f6720f13 Add QT CC track mux support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 05:00:27 +01:00
Michael Niedermayer
f742c7b2ce lavf: fix integer overflow in rfps calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 21:37:29 +01:00
Michael Niedermayer
bacebe1f95 avienc: force a valid timebase for video 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 20:26:59 +01:00
Michael Niedermayer
304ebed586 mpegts_probe: detect files with garbage at the begin. 
Fixes Ticket1811

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 17:22:04 +01:00
Tomas Härdin
84e7d368d6 mxfdec: Fix inferred misuses of enums 
This fixes CID 700457, 700458 and 703705.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 16:21:12 +01:00
Michael Niedermayer
e5cf100d3d mpegvideo_probe: check slice order 
Fixes: Enrique.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 15:08:03 +01:00
Michael Niedermayer
6992b0bfc2 utils: fix rounding of micro seconds 
Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-31 19:12:47 +01:00
Stefano Sabatini
be0b37c649 lavf/avienc: fix/extend error message, in case of too large number of skipped frames 2012-10-31 14:46:40 +01:00
Stefano Sabatini
f35d5f966f lavf/avienc: enable debug log 2012-10-31 14:46:24 +01:00
Michael Niedermayer
f7a9a99661 wavenc: fix curruption of metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 21:48:39 +01:00
Michael Niedermayer
a201639a01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavutil/pixfmt.h
	libswscale/swscale_unscaled.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 17:47:36 +01:00
Michael Niedermayer
6f5f7f705d Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a' 
* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
  Remove INIT_AVX from x86inc.asm.
  Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
  dv: fix indentation

Conflicts:
	libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 15:28:24 +01:00
Michael Niedermayer
e79c3858b3 Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  dv: use AVStream.index instead of abusing AVStream.id
  lavfi: add ashowinfo filter
  avcodec: Add a RFC 3389 comfort noise codec
  lpc: Add a function for calculating reflection coefficients from samples
  lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
  lavr: document upper bound on number of output samples.
  lavr: add general API usage doxy
  indeo3: remove duplicate capabilities line.
  fate: ac3: Add dependencies

Conflicts:
	Changelog
	doc/filters.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavfilter/Makefile
	libavfilter/af_ashowinfo.c
	libavfilter/allfilters.c
	libavfilter/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 14:40:22 +01:00
Michael Niedermayer
cd37963684 Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 
* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
	cmdutils.c
	ffmpeg.c
	libavformat/nut.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 13:52:03 +01:00
Luca Barbato
7658295ba3 pixfmt: support more yuva formats 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-10-30 12:02:42 +01:00
Michael Niedermayer
91295f03d4 mp3dec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:11:21 +01:00
Anton Khirnov
ede4cedf47 dv: fix indentation 2012-10-29 21:35:09 +01:00
Anton Khirnov
14f031d7ec dv: use AVStream.index instead of abusing AVStream.id 2012-10-29 21:34:05 +01:00
Martin Storsjö
f21d5c905d rtsp: Avoid a cast when calling strtol 
This gets rid of this warning:

libavformat/rtsp.c: In function ‘rtsp_parse_transport’:
libavformat/rtsp.c:794: warning: cast discards qualifiers from pointer target type

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-29 17:47:25 +02:00
Tim Nicholson
8a9b48bfa9 movenc: Add required 'prof' atom to 'tapt' atom set. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 16:45:37 +01:00
Michael Niedermayer
67420b3de5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add CODEC_CAP_DR1 to all video decoders missing them
  rtpdec: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 13:15:27 +01:00
Luca Barbato
d4bff9f1ab nut: support textual data 
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
 2012-10-29 12:03:28 +01:00
Luca Barbato
07585ffa62 nutenc: verbosely report unsupported negative pts 
Additionally use the correct error number.
 2012-10-29 10:52:13 +01:00
Michael Niedermayer
a3886ea3c5 smoothstreamingenc: check return value of mkdir() 
Fixes CID732188
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 03:34:17 +01:00
Michael Niedermayer
b399816d9c smoothstreamingenc: fix integer overflow 
Fixes CID732248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 03:17:08 +01:00
Paul B Mahol
c2e2b3029e cafdec: fix parsing of chunks which may have unused data 
Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks
to have data section size larger than chunk's current meaningful
content in order to reserve room for additional data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-28 20:33:29 +00:00
Clément Bœsch
3d6a246b4b lavf/srtenc: add AVFMT_TS_NONSTRICT flag. 
There is not really a problem in having two events at the same time.
Even if it's not perfectly correct, it helps remuxing more files
(typically our FATE sample).
 2012-10-28 20:45:58 +01:00
Martin Storsjö
48f01398ba rtpdec: Cosmetic cleanup 
Mainly clean up the RTP statistics code, plus a few other obviously
misindentend lines.

Remove some useless comments, de-doxygenize some comments,
add spacing around operators and fix a typo.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-28 20:50:01 +02:00
Paul B Mahol
07ed191b15 parse ID3v2 chapters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-28 15:10:28 +00:00
Carl Eugen Hoyos
96fac764fa Add an additional AAC TwoCC. 
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
Originally committed to vlc by Jean-Baptiste.
 2012-10-28 14:50:11 +01:00
bbraun
d72aef4e92 movenc: add more metadata types 
Fixes Ticket1052

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 14:36:57 +01:00
Michael Niedermayer
c73fcc8de3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  yuv4mpeg: reject unsupported codecs
  nutenc: K&R formatting cosmetics
  assdec: fix qsort() callback signature
  configure: detect sparc64 automatically
  vp8: fix memset() crossing array boundary
  h264: fix invalid pointer arithmetic
  amrwbdec: fix invalid pointer arithmetic

Conflicts:
	libavformat/nutenc.c
	libavformat/yuv4mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 14:24:27 +01:00
Michael Niedermayer
8943ad4014 Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
	libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 13:19:11 +01:00
Luca Barbato
424b1e7642 yuv4mpeg: reject unsupported codecs 
The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.
 2012-10-28 05:07:55 +01:00
Luca Barbato
fce4450dec nutenc: K&R formatting cosmetics 2012-10-28 05:07:55 +01:00
Michael Niedermayer
0f943ed3c8 swfenc: zero fifo after freeing 
Fixes CID602000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 23:03:07 +02:00
Piotr Bandurski
2ef26b5e73 riff: support 0xa100 TwoCC 
fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 21:41:59 +02:00
Mans Rullgard
4cbae57cef assdec: fix qsort() callback signature 
This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 18:26:28 +01:00
Mans Rullgard
4521645b1a avio: fix pointer type mismatches in avio_enum_protocols() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:43:44 +01:00
Mans Rullgard
be2efe0c7b udp: use socklen_t where appropriate 
getsockname() takes a pointer to socklen_t which is not necessarily
int.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:11:46 +01:00
Mans Rullgard
9efbfe57e0 network: use HAVE_THREADS instead of local hack 
HAVE_THREADS is set in config.h if pthreads or w32threads is
available, which presumably the proper condition here.

Also fixes undefined behaviour in preprocessor directives.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:11:17 +01:00
Michael Bradshaw
c430cb49fd Update my email address 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 02:06:21 +02:00
Clément Bœsch
5f0105b820 lavf/srtenc: allow zero duration events. 
This is useful when you want to remux events with zero (or too small)
durations.
 2012-10-26 21:48:27 +02:00
Paul B Mahol
adc61d68b0 bit: check av_new_packet() return value 
Fixes CID703626.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-26 15:34:25 +00:00
Michael Niedermayer
c01a462cda rmdec: fix null derefercne 
Fixes CID733714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 16:18:09 +02:00
Michael Niedermayer
1bf5071104 rmdec: use av_assert for audio_pkt_cnt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 16:13:16 +02:00
Michael Niedermayer
9aa630a520 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
	libavformat/pcmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 15:20:48 +02:00
Paul B Mahol
7fe6f6e2b1 caf muxer: write metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-26 03:12:45 +00:00
Michael Niedermayer
507f2940cc Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
	ffmpeg.c
	libavformat/Makefile
	libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 14:24:57 +02:00
Matthieu Bouron
cfb1c3c9f0 aiffdec: read ID3 attached pictures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 01:52:40 +02:00
Paul B Mahol
73f9d2e887 cafenc: make .long_name match demuxer 
While here reindent .codec_tag .

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 23:04:13 +00:00
Paul B Mahol
43f662d9bf lvfdec: cosmetics: fix identation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 20:57:40 +00:00
Luca Barbato
254056c4ab pcm: change references to raw to pcm 2012-10-25 17:08:58 +02:00
Luca Barbato
587874ef1c rawdec: remove ff_raw_read_header 
It is not used anymore and is a kludge.
 2012-10-25 14:05:13 +02:00
Luca Barbato
2ef4d586d6 pcmdec: remove dependency from rawdec 
The code shared is not actually shared with anything else.
 2012-10-25 14:05:13 +02:00
Luca Barbato
5f0e161dd6 g722: refactor out of rawdec.c 2012-10-25 14:05:05 +02:00
Luca Barbato
42c26a4864 rawvideo: use a specific read_header 
ff_raw_read_header is used only for this demuxer for video.
 2012-10-25 14:04:18 +02:00
Tomas Härdin
5c108092a3 mxfenc: Write MultipleDescriptor ref in Preface 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 13:56:24 +02:00
Michael Niedermayer
aa604e8e33 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
	configure
	libavutil/Makefile
	libavutil/lzo.c
	libavutil/lzo.h
	libavutil/mem.c
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 13:15:58 +02:00
Diego Biurrun
2a91ada828 avutil: Make LZO decoder code configure-time selectable 2012-10-25 11:49:49 +02:00
Michael Niedermayer
ed68085104 asfdec: fixed signedness in comparission 
Fixes CID739864
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:35:55 +02:00
Michael Niedermayer
58c2c17f1d mov_probe: use correct variable 
Fixes CID739867
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:24:25 +02:00
Clément Bœsch
2ecf9492ff lavf/srtenc: set codec to subrip by default. 
We don't have a text encoder yet, so this commit makes automatic
encoding working with srt output.
 2012-10-25 00:17:56 +02:00
Clément Bœsch
fd090a5d09 lavf/srtenc: simplify timing printing. 2012-10-25 00:17:46 +02:00
Clément Bœsch
c27b3816e4 srt: make the demuxer output SubRip packets. 
The SRT format should never have outputted CODEC_ID_SRT packets in the
first place: SRT is a subtitle format containing SubRip text markup
events. The timing information is part of the format, not the codec, and
thus CODEC_ID_SRT should not exist.

Creating packets with the timing information within the payload only
leads to problem (such as remuxing with timing alteration not working),
especially when the SubRip markup is being used in container like
Matroska in addition to this standalone SRT format.

The main reason the timing line was included in those CODEC_ID_SRT
packets is likely because it contained extra information (the event
position) the codec actually needs. This issue is solved by using the
AV_PKT_DATA_SUBTITLE_POSITION side data type.
 2012-10-25 00:09:36 +02:00
Clément Bœsch
a96b39de62 lavf/srtdec: simplify start/end computation. 
Also fix potential overflow (CID733778)
 2012-10-24 23:56:43 +02:00
Clément Bœsch
c01d1d4ddf http: add -content_type user option. 2012-10-24 22:15:31 +02:00
Paul B Mahol
e12cfd044c lavf: const correctness for avformat_new_stream 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-24 17:55:35 +00:00
Tomas Härdin
e3ba817b95 mxfenc: Fix possible integer overflows 
None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.

This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 17:46:27 +02:00
Tomas Härdin
fbb39f44f1 mxfdec: Fix potential leak in mxf_read_local_tags() 
This fixes CID 733800.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 17:45:49 +02:00
Tomas Härdin
1d22d269f5 mxfdec: Fix a potential DoS vector in mxf_read_pixel_layout() 
There's a a potential DoS problem in this function. Say an MXF file is
created with a PixelLayout with a long run of non-zeroes. Such a file could be
sent quickly (packed) over the net and would unpack quite fast. mxfdec would
then read it byte-by-byte, which would take considerable time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 17:44:35 +02:00
Tomas Härdin
187630b244 mxfdec: Fix CID 732262 
Coverity thinks ofs can end up 15, thus writing past the end of layout[]. This
is incorrect since it's always incremented by 2. Checking ofs <= 14 makes
Coverity happy and doesn't hurt.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 17:44:35 +02:00
Michael Niedermayer
8a34b85fa8 avio: detect implicit truncation by assert in avio_w* 
This check is somewhat more lenient as would be ideal because we dont
know if the input is signed or unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 15:42:00 +02:00
Michael Niedermayer
a3fb3a670e avio: avoid implicit truncation in avio_w* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 15:27:03 +02:00
Michael Niedermayer
e377b50b2d matroskaenc: avoid implicit truncation in avio_w* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 15:27:01 +02:00
Michael Niedermayer
d0ab71ed11 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  asfdec: cosmetics, reformat ff_asf_parse_packet()
  g.723.1: add missing CODEC_CAP_DR1
  avconv: remove now unneeded calls to avcodec_get_frame_defaults().
  lavc: initialize output AVFrame before decoding.

Conflicts:
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 14:26:13 +02:00
Martin Storsjö
c44cef978b smoothstreamingenc: Don't assume streams start from timestamp 0 
Also use dts instead of pts for deciding where to split fragments.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-24 14:46:08 +03:00
Michael Niedermayer
f3b8096bc0 Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
  mp3: exit on parsing error in mp_decode_frame
  rtmppkt: Avoid unescaped backslash in Doxygen comment
  fate-lavfi: replace sed/grep/cut combos with awk
  build: Plan 9 support

Conflicts:
	configure
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 13:42:58 +02:00
Michael Niedermayer
2dbc93455c Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 
* commit '80521c1997a23e148edf89e11b939ab8646297ca':
  build: allow targets to specify extra objects to link with executables
  swscale: avoid pointless use of compound literals
  libm: add fallbacks for various single-precision functions
  network: use getservbyport() only if available
  network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
  Include sys/time.h before sys/resource.h

Conflicts:
	Makefile
	configure
	libavutil/libm.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 12:53:26 +02:00
Anton Khirnov
292a08cbab asfdec: cosmetics, reformat ff_asf_parse_packet() 2012-10-24 08:46:45 +02:00
Carl Eugen Hoyos
2fdc6f355c Do not detect mov with maximum score if the atom size is too small. 
Fixes mpegts-in-mov, ticket #987 / issue 2223.
 2012-10-23 22:41:15 +02:00
Michael Niedermayer
5442c6cce3 lavf: fix duration estimation for multi program TS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 18:11:26 +02:00
Michael Niedermayer
31cdf6002a lavf: increase retries to guess duration from pts by 1 
This fixes finding the duration for one TS file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 17:31:31 +02:00
Michael Niedermayer
d8f27eceaa asfdec: ignore stored duration for truncated files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 16:11:38 +02:00
Peter Ross
8469fc17e2 wtvdec: display warning for encrypted wtv files (instead of 'unsupported chunk' messages) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 15:26:57 +02:00
Michael Niedermayer
35ce42e070 Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714' 
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
	libavcodec/aacsbr.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 15:00:27 +02:00
Diego Biurrun
c2dac8ac7a rtmppkt: Avoid unescaped backslash in Doxygen comment 2012-10-23 13:36:58 +02:00
Mans Rullgard
4ebc6a7410 build: Plan 9 support 
This adds support for building on Plan 9 x86-32.  The compat/plan9
directory contains these items:

- replacements for the 'head' and 'printf' shell commands
- wrapper for main() to disable FPU exceptions

Larger required changes to the system are described in the
documentation.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-23 12:01:18 +01:00
Mans Rullgard
c3e73100af network: use getservbyport() only if available 
The absence of this function will only give a less informative
string back from our fallback implementation of getnameinfo().

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-23 12:00:21 +01:00
Mans Rullgard
da0d0ae9a4 network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-23 12:00:21 +01:00
Diego Biurrun
8f4c414df6 Improve wording and spelling of av_log_missing_feature messages. 2012-10-23 10:28:40 +02:00
Paul B Mahol
a57d560db3 LVF demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-22 23:22:39 +00:00
Matthieu Bouron
c68a8a1340 lavf/aiffdec: don't stop parsing after SSND chunk 
Some file has ID3 chunk placed after SSND.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-22 19:38:27 +02:00
Matthieu Bouron
d8173f264f dv: fix a check on dv_extract_timecode return value 
Fixes CID733808

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-22 19:09:47 +02:00
Michael Niedermayer
e3a91c51f7 Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 
* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
  rtpdec: Don't pass a non-AVClass pointer as log context
  rtsp: Update a comment to the current filename scheme
  avcodec: handle AVERROR_EXPERIMENTAL
  avutil: Add AVERROR_EXPERIMENTAL
  avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/utils.c
	libavformat/rtpdec.c
	libavutil/error.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-22 14:39:12 +02:00
Paul B Mahol
cb0add3ce9 lavf/flacenc: disallow creation of invalid files with -c copy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-22 08:07:09 +00:00
Anton Khirnov
6173a8fe5d riff: remove a write-only variable 2012-10-22 08:49:58 +02:00
Martin Storsjö
c3e15f7b39 rtpdec: Don't pass a non-AVClass pointer as log context 
The log context is assumed to start with an AVClass pointer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-22 01:46:33 +03:00
Martin Storsjö
e0d5ac6ae3 rtsp: Update a comment to the current filename scheme 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-22 01:46:10 +03:00
Michael Niedermayer
248b1ff26b Fix various uses of av_log_missing_feature() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 23:13:53 +02:00
Carl Eugen Hoyos
fa190b3cd7 Improve MPEG-PS-in-MOV detection. 
Fixes issue 1520.
 2012-10-21 19:30:43 +02:00
Michael Niedermayer
40ceb6d49f libavformat/oggenc: add {} to complex ifs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 18:05:23 +02:00
Michael Niedermayer
c2c066784f libavformat/mxfenc: add {} to complex ifs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 18:05:23 +02:00
Michael Niedermayer
b8a64d69a9 libavformat/mpegvideodec: add {} to complex ifs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 18:05:23 +02:00
Michael Niedermayer
fefe9bd782 libavformat/movenc: add {} to complex ifs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 18:05:23 +02:00
Michael Niedermayer
217193facd bavformat/mov: add {} to complex ifs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 18:05:23 +02:00
Michael Niedermayer
b6267901c4 mp3demux: Rewrite xing TOC based seeking 
The libav code depends on mp3 startcodes only occuring at the start of
frames. But there is nothing in mp3 that prevents them occuring elsewhere
by chance. Thus the code would fail randomly, the new code searches for 3
consecutive valid frames. If this turns out to be still insufficient the
number can be raised further, or additional checks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-21 03:13:46 +02:00
Clément Bœsch
99a520000d lavf/webvttdec: fix potential timing overflows. 
Should fix CID733781 and CID733782.
 2012-10-21 01:16:49 +02:00
Clément Bœsch
1ea3c03743 lavf/subviewerdec: fix potential timing overflows. 
Should fix CID733779 and CID733780.
 2012-10-21 01:08:17 +02:00
Michael Niedermayer
044c0e62ea udp: add missing mutex unlock 
Fixes CID703688
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 23:31:32 +02:00
Michael Niedermayer
c4503a2e40 rtpdec: check av_new_packet() return value 
Fixes CID733715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 23:07:16 +02:00
Michael Niedermayer
3a8b66af6c rtmp_write_amf_data: remove dead code 
Fixes CID732199
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 22:57:30 +02:00
Michael Niedermayer
e4ef2e073c riff_has_valid_tags: remove unused variable 
Fixes CID739471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 22:34:01 +02:00
Michael Niedermayer
73581afe01 nutdec: fix integer overflow 
Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:45:32 +02:00
Michael Niedermayer
d633e15d7d nsvdec: fix division by 0 
Fixes CID717749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:20:39 +02:00
Michael Niedermayer
ee23dcf534 avformat_free_context: allow NULL as argument 
Fixes CID703682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:13:18 +02:00
Michael Niedermayer
830f7f189f mmsh: fix integer overflow in mmsh_seek() 
Fixes CID703745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:13:18 +02:00
Michael Niedermayer
dd84efe3c7 matroskaenc: Fix hypothetical integer overflows 
Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 19:05:15 +02:00
Michael Niedermayer
b1f517f503 matroskaenc: check avio_open_dyn_buf() retuen code 
Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 19:05:15 +02:00
Michael Niedermayer
2c5b92fe90 matroskadec: fix double negation typo 
Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 16:58:33 +02:00
Michael Niedermayer
1116491c53 matroska_parse_rm_audio: check for malloc failure 
Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 16:55:45 +02:00
Michael Niedermayer
04c6ecb7da Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
  fate-vc1: add dependencies
  ARM: fix overreads in neon h264 chroma mc
  rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
  gitignore: ignore files created by msvc
  fate: Add proper dependencies for the tests in video.mak
  configure: Disable Snow decoder and encoder by default
  lzo: Drop obsolete fast_memcpy reference
  build: Drop OBJS declaration for non-existing PCM_DVD encoder
  mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Conflicts:
	libavcodec/mpegvideo.c
	libavformat/rtsp.c
	tests/fate/microsoft.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 12:37:52 +02:00
Martin Storsjö
2f41eaa9c6 rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-20 01:59:06 +03:00
Michael Niedermayer
8fb8d539a4 hlsproto: fix integer overflow 
Fixes CID703743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:24:03 +02:00
Michael Niedermayer
ba39303050 gxfenc: fix null ptr dereference 
Fixes CID703677
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:21:41 +02:00
Michael Niedermayer
395caf3de8 hls: fix integer overflow 
Fixes CID717892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:00:47 +02:00
Michael Niedermayer
a96577df38 avio: fix sizeof argument 
Fixes CID732284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 22:35:32 +02:00
Michael Niedermayer
d30351363f url_alloc_for_protocol: fix use of uninitialized variable 
Fixes CID703830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 22:14:13 +02:00
Michael Niedermayer
3d48dd01fd avidec: remove unneeded null check 
Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 21:46:39 +02:00
Petter Ericson
7abf394814 mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force continued probing if found. 
Fixes Ticket241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 16:07:49 +02:00
Michael Niedermayer
81ff0c24ef Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  configure: fix libcdio check
  rtsp: Allow setting the reordering buffer size via an AVOption
  rtsp: Vertically align a constant definition
  rtp: Update the check for distinguishing between RTP and RTCP
  aac: fix build with hardcoded tables
  fate: dependencies for screen codec tests
  riff: Move functions around to be covered by appropriate #ifdefs

Conflicts:
	configure
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 13:58:14 +02:00
Michael Niedermayer
93f244e3ab Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95' 
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
  avformat: Fix references to the removed function av_write_header in comments
  changelog: Mention the MSVC DLL support
  fate: add dependencies for misc microsoft codecs
  fate-twinvq: add dependencies
  fate-mpc: add dependencies
  fate-indeo: add dependencies
  fate-als: add dependencies
  fate: dependencies for demux tests

Conflicts:
	Changelog
	tests/Makefile
	tests/fate/demux.mak
	tests/fate/microsoft.mak
	tests/fate/mpc.mak
	tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 13:47:47 +02:00
Michael Niedermayer
b0554fec04 Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72' 
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
  fate: add a dependency helper macro
  Add support for building shared libraries with MSVC
  avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
  gxf: Add a local copy of the relevant parts of the frame rate table
  configure: Split out msvc as a separate target OS
  aviobuf: Remove a senseless ifdef in avio_seek

Conflicts:
	configure
	libavcodec/dirac.c
	libavcodec/mpeg12data.h
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 13:29:24 +02:00
Martin Storsjö
3f055f8f5f rtsp: Allow setting the reordering buffer size via an AVOption 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 23:10:48 +03:00
Martin Storsjö
1c37744963 rtsp: Vertically align a constant definition 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 23:10:42 +03:00
Martin Storsjö
0de9380be5 rtp: Update the check for distinguishing between RTP and RTCP 
Also add enums for more RTCP packet types, according to the IANA
list of registered types.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 23:10:20 +03:00
Diego Biurrun
7b2121e7e2 riff: Move functions around to be covered by appropriate #ifdefs 
This fixes compilation with --disable-muxers.
 2012-10-18 16:12:45 +02:00
Michael Niedermayer
d0c27e88d2 riff: retry reading metadata without padding if it fails with 
Fixes Ticket1821

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 16:03:16 +02:00
Michael Niedermayer
1350dffdc6 riff: dont discard truncated metadata 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 16:02:50 +02:00
Martin Storsjö
0af1fe845a avformat: Fix references to the removed function av_write_header in comments 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 16:33:48 +03:00
Martin Storsjö
fc085c5b33 gxf: Add a local copy of the relevant parts of the frame rate table 
This avoids having to share this table across the library
boundaries.

This shared table used to be problematic, if always declaring
all exported data symbols with the dllimport attribute (even
while building that same library), since it needs to be a
link-time constant when it is used in AVCodec declarations
(in mpeg12enc.c).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 14:26:13 +03:00
Michael Niedermayer
eb19d89d8e cache: check lseek() return 
Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 00:55:03 +02:00
Martin Storsjö
b760ffdd07 aviobuf: Remove a senseless ifdef in avio_seek 
This seemed to assume that one never used writing avio unless
muxers or networking was enabled.

This ifdef is a remnant since 8fa641f8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 01:44:05 +03:00
Michael Niedermayer
f03c0f6afc ffmdec: check av_new_packet() return value 
Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:45:59 +02:00
Michael Niedermayer
a0e0e1e192 ffmdec: fix hypothetical overflows 
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:36:30 +02:00
Michael Niedermayer
7fd65104f4 ffm_seek: fix division by zero 
Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:14:43 +02:00
Michael Niedermayer
a4fe661157 mov_probe: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 17:50:14 +02:00
Michael Niedermayer
775d41b617 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:53:42 +02:00
Michael Niedermayer
df5e089da9 Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1' 
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:46:08 +02:00
Michael Niedermayer
d8cfa98358 Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' 
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:16:23 +02:00
Michael Niedermayer
c079da5073 Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 
* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:43:26 +02:00
Michael Niedermayer
fadfbb354b Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
	ffmpeg_opt.c
	libavformat/riff.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:30:25 +02:00
Michael Niedermayer
d6e87190fd Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
	ffserver.c
	libavcodec/ffv1.c
	libavformat/ffmdec.c
	libavformat/nutenc.c
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:17:55 +02:00
Paul B Mahol
d6ea59b860 tta: datalen is unsigned integer per reference library 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 11:58:08 +00:00
Clément Bœsch
711ffb84df lavf/swfdec: support DefineBitsLossless{,2} tag. 2012-10-17 07:49:17 +02:00
Michael Niedermayer
adbb75dbd8 mov: fix time types related to mov_metadata_creation_time 
Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 02:48:30 +02:00
Michael Niedermayer
cb65b32c97 mp3enc: remove unneeded null ptr check 
Fixes: CID733746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 20:27:16 +02:00
Michael Niedermayer
6d55a40b00 mov: print warning if ff_get_wav_header() fails 
Fixes CID717497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 20:21:31 +02:00
Michael Niedermayer
24d6af0f7e sierravmd: flip reduce arg order. 
This should make no difference but might help static analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 20:03:37 +02:00
Michael Niedermayer
de6c150444 nut: fix int32 overflow 
Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 19:59:01 +02:00
Michael Niedermayer
340305646a riff: fix division by zero for G726 
Fixes CID717752
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 19:56:05 +02:00
Anton Khirnov
a43283b6f4 wavdec: check size before reading the data, not after. 2012-10-16 18:52:21 +02:00
Anton Khirnov
79922d7237 wav: do not fail on empty INFO tags 
Fixes Bug 379

CC: libav-stable@libav.org
 2012-10-16 18:52:14 +02:00
Anton Khirnov
31c54711cc lavf: split wav muxer and demuxer into separate files. 2012-10-16 18:52:07 +02:00
Victor Vasiliev
58b619c8a2 wav muxer: write metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:51:56 +02:00
Victor Vasiliev
0bca0283cc riff: do not write empty INFO tags 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:51:16 +02:00
Victor Vasiliev
71e92414bf lavf: move RIFF INFO tag writing from avienc to riff 
It will be useful in the wav muxer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:50:36 +02:00
Mans Rullgard
1fbaabefc4 network: #include stdint.h in network.h 
This header uses various types provided by stdint.h without
explicitly including it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-16 14:45:29 +01:00
Luca Barbato
21de6ba5c1 nut: export codec_tag provided by rawvideo 
Raw audio does not provide valid audio tags while rawvideo does.
The fate refs have to be updated because it undoes the previous tag
change.
 2012-10-16 15:26:31 +02:00
Mans Rullgard
3b20eb25e7 avserver: move avserver-specific code from ffmdec.c to avserver.c 
This way avserver only depends on the data structures of the ffm
demuxer, which it already does, and not also on private functions
being exported by the library.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-16 14:20:05 +01:00
Michael Niedermayer
9270a2b374 Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 
* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
  configure: simplify get_version() function
  build: support asan and tsan toolchain shortcuts
  rmdec: Move SIPR code shared with Matroska demuxer to a separate file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 13:20:46 +02:00
Michael Niedermayer
3896cd11a1 mxfenc: explicitly truncate continuity count. 
The field is intended to overflow and have only its low 16bits stored.
This commit avoids the implicit truncation and clarifies that its
intended and not a bug

S326m section 7.6 ("Continuity count"):
> The continuity count word consists of 2 bytes allow-
> ing a number to be created by a modulo 65536
> counter (bits C15 to C0 in figure 7). The continuity
> count shall increment by 1 for each newly transmit-
> ted content package with the same SDTI source and
> destination addresses. The continuity count may
> be used to detect whether the content package
> sequence has been broken by an operation such as
> a routing switch.

Approved-by: Tjoppen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 03:01:15 +02:00
Michael Niedermayer
901f4bb6fc utils: consider mpeg4 in mp4/mov to have a unreliable timebase 
Partly fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 01:04:02 +02:00
Paul B Mahol
3ca8a23288 lavf/audiointerleave: check return value of av_new_packet() 
Fixes CID733709.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 17:03:41 +00:00
Paul B Mahol
bb502411dd nutdec: check return value of av_new_packet() 
Fixes CID733173.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 17:03:41 +00:00
Paul B Mahol
d7d5b5dfc1 flvdec: check return value of create_stream() 
Fixes null pointer dereference. Fixes CID732242.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 15:59:53 +00:00
Paul B Mahol
295218f531 idcin: check chunk_size value before using it 
Fixes integer overflow. Fixes CID732223.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 15:48:13 +00:00
Paul B Mahol
3f8148911c img2dec: check return value of av_new_packet() 
Fixes CID703626.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 14:53:56 +00:00
Michael Niedermayer
5c7a62aef5 movenc: fix tmcd parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 15:09:46 +02:00
Diego Biurrun
7e68c91e24 rmdec: Move SIPR code shared with Matroska demuxer to a separate file 2012-10-15 13:34:07 +02:00
Paul B Mahol
4f5e5a0513 lavf/txd: cosmetics: fix identation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 08:12:25 +00:00
Clément Bœsch
b08273c9ca lavf/mkv: avoid negative ts by default. 
This fixes playback in some circumstances (like webm in firefox).
Regression after 2c34367b.

It is also matching the Matroska specifications:
http://matroska.org/technical/specs/notes.html, "The quick eye will
notice that if a Cluster's Timecode is set to zero, it is possible to
have Blocks with a negative Raw Timecode. Blocks with a negative Raw
Timecode are not valid."
 2012-10-15 09:19:21 +02:00
Stefano Sabatini
cd559bb49a lavc: add xface image decoder and encoder 
Based on libcompface code by James Ashton <James.Ashton@anu.edu.au>, and
relicensed to LGPL with the author's consent.
 2012-10-15 08:32:18 +02:00
Michael Niedermayer
45bd0d15f4 lavf: fix fps detection with PAFF H.264 
Fixes Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 19:20:23 +02:00
Michael Niedermayer
82c0055c5e Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
  configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
  configure: recognise Minix as OS
  configure: work around bug in ash shell
  eval-test: make table static const
  lavr: handle clipping in the float to s32 conversion
  nut: support pcm codecs not mapped in avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 14:46:13 +02:00
Michael Niedermayer
db51c65961 Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f' 
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 14:31:55 +02:00
Paul B Mahol
039341eb43 wv: do not report invalid stream duration 
If total number of samples is -1 it means stream is of unknown length.

Fixes ticket #1777.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 10:41:16 +00:00
Michael Niedermayer
d31098113f mp3enc: fix signed C99 overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 05:52:50 +02:00
Michael Niedermayer
693097c355 paf: avoid C99 overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 04:01:41 +02:00
Michael Niedermayer
2fed05f53a avoid more "0xFF << 24" as it is considered a integer overflow in C99 
missed these in my previous search and replace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 03:34:16 +02:00
Dmitry Samonenko
083c7bf701 sdp: output speex optional vbr parameter 
Optional sdp speex payload parameter is outputed only when
data is encoded. It's not printed in case of stream copy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 18:47:18 +02:00
Paul B Mahol
6571833d1a smjpegdec: use url_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-13 14:15:58 +00:00
Michael Niedermayer
18884f159b Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
	libavcodec/aacdec.c
	libavcodec/amrnbdec.c
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 15:42:49 +02:00
Michael Niedermayer
d197bd4f5e Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066' 
* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
  avutil: Duplicate ff_log2_tab instead of sharing it across libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 14:24:58 +02:00
Michael Niedermayer
3b0bb321a5 Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 
* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
  avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
  rtspdec: Set the default port for listen mode, if none is specified
  tscc2: Fix an out of array access
  rtmpproto: Fix an out of array write
  rtspdec: Fix use of uninitialized byte
  vp8: reset loopfilter delta values at keyframes.
  avutil: add yuva422p and yuva444p formats

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 14:14:11 +02:00
Luca Barbato
1bd442c276 nut: prioritize native tags 
Use native tags instead of avi ones, simplifies a lot raw video codecs
handling.
 2012-10-13 12:33:18 +02:00
Luca Barbato
92281850a2 nut: support pcm codecs not mapped in avi 
The native tags will be used when available.
 2012-10-13 12:33:18 +02:00
Carl Eugen Hoyos
6254ffe0ca Allow autodetection of some dnxhd files that can be decoded correctly. 
Fixes ticket #1807.
 2012-10-13 11:59:37 +02:00
Michael Niedermayer
f657d495b0 rtpdec_qdm2: change one assert to av_assert0 
Failure of this assert could lead to hard to debug behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 03:32:37 +02:00
Michael Niedermayer
e47024d72f wtvdec: fix memleak on error 
Fixes CID718002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 02:37:47 +02:00
Michael Niedermayer
120b38b966 avio: redesign ffio_rewind_with_probe_data() 
This prevents a double free

Fixes CID718285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-13 02:08:59 +02:00
Mans Rullgard
0a7005bebd rtpdec_xiph: fix function return type 
parse_packed_headers() returns either zero or a negative error code
so its return type must be signed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-12 22:21:10 +01:00
Mans Rullgard
366484fff1 smjpeg: fix type of 'ret' variable in smjpeg_read_packet() 
The 'ret' variable is used for negative error codes so it should
be a signed type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-12 22:21:10 +01:00
Clément Bœsch
cdfa926415 lavf/swf: transform the swf tags define in an enum. 2012-10-12 23:15:21 +02:00
Clément Bœsch
a1d2210deb lavf/swf: re-align after previous commit. 2012-10-12 23:15:12 +02:00
Clément Bœsch
91fad50f63 lavf/swf: define more tags. 
Based on swf specs v10, page 271-273.
 2012-10-12 23:15:08 +02:00
Clément Bœsch
cd78192d09 lavf/swfdec: return more meaningful error codes. 2012-10-12 23:15:05 +02:00
Clément Bœsch
0c40220b9d lavf/swfdec: fix flushing with compressed swf. 
We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.
 2012-10-12 21:59:06 +02:00
Diego Biurrun
717addecad Use proper return values in case of missing features 2012-10-12 20:56:54 +02:00
Diego Biurrun
930c9d4373 avutil: Duplicate ff_log2_tab instead of sharing it across libs 
The table is so small that the space gain is not worth the
performance overhead of cross-library access.
 2012-10-12 20:39:17 +02:00
Michael Niedermayer
b8d64559d5 movenc: fix timescale for timecode track 
regression since b02493e476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 20:16:48 +02:00
Heesuk Jung
e3301459f6 avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755) 
In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)

I found additional case(ss=4096) and add condition.

Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 17:57:35 +02:00
Michael Bradshaw
a41c824c53 Parse DEFINESOUND tags in swf (fix ticket 1638) 
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 17:37:34 +02:00
Martin Storsjö
5a2cb78219 rtspdec: Set the default port for listen mode, if none is specified 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-12 18:17:24 +03:00
Michael Niedermayer
2f1b2ff934 rtmpproto: Fix an out of array write 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-12 18:16:59 +03:00
Michael Niedermayer
eae35eadc0 rtspdec: Fix use of uninitialized byte 
ffurl_read_complete can return 0 as well as negative error codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-12 18:16:57 +03:00
Paul B Mahol
3d179edf6d yop: check return value of avformat_new_stream() 
Fixes null pointer dereference, fixes CID703729.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 14:25:00 +00:00
Michael Niedermayer
a33ed6bc74 Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 
* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
  tools: do not use av_pix_fmt_descriptors directly.
  pixdesc: add functions for accessing pixel format descriptors.
  build: add support for Tru64 (OSF/1)
  md5: Allocate a normal private context for the opaque md5 context pointer

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffprobe.c
	libavformat/md5enc.c
	libavutil/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 15:34:49 +02:00
Michael Niedermayer
f391e405df Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:52:34 +02:00
Michael Niedermayer
5a75924dfd rtmpproto: fix out of array write 
Fixes CID732263
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 02:06:51 +02:00
Michael Niedermayer
0c6b9b9fe5 rtspdec:read_line: fix use of uninitialized byte 
Fixes CID732301
Fixes CID723300
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:08:28 +02:00
Michael Niedermayer
59cbedfc3d update_initial_timestamps: increase pts_buffer size 
Fixes CID733786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:08:28 +02:00
Martin Storsjö
da18e918a4 md5: Allocate a normal private context for the opaque md5 context pointer 
This avoids having to overestimate the md5 context size, which
isn't known beforehand, allowing us to use the new allocate functions
instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 23:35:29 +03:00
Martin Storsjö
e002e3291e Use the new aes/md5/sha/tree allocation functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 23:35:28 +03:00
Paul B Mahol
3632f35c8e bethsoftvid: check return value of av_packet_new_side_data() 
Fixes null pointer dereference, fixes CID733777.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-11 19:40:27 +00:00
Michael Niedermayer
526cb36e4b Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
  build: remove references to unused EXTRAOBJS variable
  lavfi: convert input/ouput list compound literals to named objects
  fate: add h263 obmc vsynth tests
  avconv: remove bogus warning when using avconv -h without parameter
  averror: explicitly define AVERROR_* values
  flashsv: propagate inflateReset() errors
  indeo4/5: remove constant parameter num_bands from wavelet recomposition
  mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
  Double motion vector range for HPEL interlaced picture in proper place

Conflicts:
	libavcodec/v210dec.h
	libavfilter/af_aformat.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_channelmap.c
	libavfilter/af_join.c
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/f_setpts.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_select.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_testsrc.c
	libavformat/mxfdec.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 15:46:48 +02:00
Michael Niedermayer
b6c3487e7f Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c' 
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c':
  vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
  segment: support applehttp style list

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:28:18 +02:00
Michael Niedermayer
de31814ab0 Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' 
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
  avio: introduce avio_closep
  mpegtsenc: set muxing type notification to verbose
  vc1dec: Use correct spelling of "opposite"
  a64multienc: change mc_frame_counter to unsigned
  arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
  svq1: Drop a bunch of useless parentheses
  parseutils-test: do not print numerical error codes
  svq1: K&R formatting cosmetics

Conflicts:
	doc/APIchanges
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavformat/version.h
	libavutil/parseutils.c
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:03:12 +02:00
Carl Eugen Hoyos
1a104bf641 Fix broken timestamps for some mp3 in avi samples. 
Mostly based on 73ad355 by Michael Niedermayer.
Fixes ticket #606.
 2012-10-10 23:59:43 +02:00
Michael Niedermayer
317505b566 lavf: do not prematurely accept a format with low score in init_input() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:41:20 +02:00
Michael Niedermayer
b47396b614 img2dec: detect .raw files only with a low score as img2 
They can be many other things and this otherwise breaks probing of some .raw files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:40:03 +02:00
Michael Niedermayer
94f5470a20 lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:39:19 +02:00
Janne Grunau
bd141f5ec9 mxfdec: return error if no segments are available in mxf_get_sorted_table_segments 
Fixes CID732275.
 2012-10-10 21:24:32 +02:00