virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
75,383 Commits 37 Branches 400 Tags 460 MiB
157969321a
Commit Graph

18099 Commits

Author SHA1 Message Date
Alexandra Hájková
78491fe8cf asfdec: do not export empty metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:09:27 +02:00
Alexandra Hájková
cd4d9df227 asfdec: free AVDictionaries properly when closing the demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 07:23:20 +02:00
Ganesh Ajjanagadde
c1bfb99ff2 avformat/wavdec: add extra sample count check for G.729 files 
Can be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 03:17:55 +02:00
Michael Niedermayer
bc4bdc6d61 Merge commit '764ec70149728be82304c163ccc4e280f1629201' 
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:37 +02:00
Michael Niedermayer
ba12ba859a Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744' 
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 17:52:23 +02:00
Michael Niedermayer
8e67599505 Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf' 
* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:24:03 +02:00
Martin Storsjö
764ec70149 rtsp: Only interpret $ as interleaved packet indicator at the start of replies 
Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 16:59:36 +03:00
Luca Barbato
0c73a5a53c hls: Save and forward avio options 
Make possible to send the custom headers and override the user agent.

Reported-by: BenWonder
 2015-07-30 11:21:26 +02:00
Luca Barbato
5ae178539b http: Add the trailing endlines if they are missing 
Makes slightly easier the life of those want to use the option
from the command line
 2015-07-30 11:21:26 +02:00
James Almer
9487ffd4c0 rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 09:26:49 +03:00
James Almer
6ce3d9fc4a avformat/rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 23:56:22 -03:00
wm4
4c6beaed92 rawdec: fix mjpeg probing buffer size check 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 00:06:15 +02:00
wm4
bf51fcd304 rawdec: fix mjpeg probing 
There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:50:46 +02:00
Michael Niedermayer
f8b81a02c9 avformat/oggdec: ogg_read_seek: reset ogg after seeking 
Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:22:12 +02:00
James Almer
65dd6a1f84 rtmpproto: use AVHMAC instead of a custom implementation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-29 22:09:16 +03:00
James Almer
6c87b86628 avformat/rtmpproto: use AVHMAC instead of a custom implementation 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 15:32:08 -03:00
Michael Niedermayer
f40ec70478 avformat/wavdec: Check for data_size overflow 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 13:47:44 +02:00
Ganesh Ajjanagadde
13d605e090 wavdec: make sample count check more precise 
May be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 13:13:09 +02:00
Michael Niedermayer
e1296b5fa4 Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf' 
* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
  asfdec: do not align Data Object when Broadcast Flag is set

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-28 00:13:54 +02:00
Michael Niedermayer
29d147c94d Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 23:15:19 +02:00
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:50:18 +02:00
Michael Niedermayer
94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:10:35 +02:00
Alexandra Hájková
b5c1c16247 asfdec: do not align Data Object when Broadcast Flag is set 
its size is invalid in this case

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-27 18:09:30 +02:00
Vittorio Giovara
059a934806 lavc: Consistently prefix input buffer defines 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:59 +01:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Vittorio Giovara
7c6eb0a1b7 lavc: AV-prefix all codec flags 
Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Alexandra Hájková
9e8627a1ff asfdec: interpret the first flag in an asf packet as length flag 
if the error correction flag is not set, a packet starts with payload

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-27 07:50:32 +02:00
Michael Niedermayer
c8c86b8f9b avformat/mpegts: Replace silent cliping of language_count by asserts 
Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 18:15:17 +02:00
Michael Niedermayer
42aa02418e avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles 
Fixes Ticket4200

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 15:38:40 +02:00
Michael Niedermayer
90696ef368 Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe' 
* commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe':
  asfdec: interpret the first flag in an asf packet as length flag

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 12:27:35 +02:00
Michael Niedermayer
dc07e576ce avformat/isom: Use AVRN codec to handle AVDJ 
Fixes cropping

Fixes Ticket4741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 22:27:29 +02:00
Michael Niedermayer
29a43bd588 avformat/hlsenc: Fix wording in comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 22:06:19 +02:00
Anshul Maheshwari
379ddc6af4 avformat/hlsenc: Add WebVtt support in hls 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 05:59:43 +02:00
Michael Niedermayer
c3361b3a87 avformat/ipmovie: Fix late audio detection 
Fixes audio in Ticket117

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 04:00:02 +02:00
Michael Niedermayer
8e0fdb03a2 avformat/ipmovie: Parse&handle late audio init 
Fixes Ticket117

Based on problem description by Kostya
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 03:41:57 +02:00
Michael Niedermayer
e011538394 avformat/ipmovie: Factor init_audio() out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 03:40:19 +02:00
Michael Niedermayer
7ec5115409 avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data. 
This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 18:39:17 +02:00
Zhang Rui
8a17335189 avformat/async: wake up main thread before exit background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 02:26:01 +02:00
Zhang Rui
c0a4af408e avformat/async: move more code into locked area in background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 01:43:44 +02:00
Alexandra Hájková
7f388c0fab asfdec: remove the wrong condition 
this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 10:50:27 +02:00
Alexandra Hájková
aed7715b8f asfdec: increment nb_streams right after the stream allocation 
to prevent possible memory leaks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:48:26 +02:00
Alexandra Hájková
ee80f834cb asfdec: set nb_streams to 0 in the asf_read_close 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:47:59 +02:00
Michael Niedermayer
0a03271ef6 Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52' 
* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 12:45:00 +02:00
Michael Niedermayer
40e8ade9eb Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6' 
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:43:56 +02:00
Michael Niedermayer
cd4c878934 Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff' 
* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:34:40 +02:00
Michael Niedermayer
3d083f6ffd avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 21:04:17 +02:00
Michael Niedermayer
c40ecffd31 Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS 
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data

AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 19:31:52 +02:00
Michael Niedermayer
6b9be608ce Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec' 
* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:13:18 +02:00
Michael Niedermayer
fa7defc89a Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd' 
* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:06:22 +02:00
Michael Niedermayer
fce350be0e Merge commit '5655236a67203d923755f285584c6e68abe7e33f' 
* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:53:26 +02:00
Michael Niedermayer
9837d3b068 avformat/asfdec_f: Parse ECC byte according to spec 
This should not change anything as the spec requires specific values
for the fields, which where handled previously.

Ask for samples when these values do not match

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 14:11:48 +02:00
Alexandra Hájková
2a187a074a asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
93f16f338f asfdec: close the demuxer properly when read_header is failing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
5655236a67 asfdec: factor out seeking to the Data Object outside while 
return INVALIDDARA if Data Object was not found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Carl Eugen Hoyos
6b2bb3d231 Cosmetics: Reindent after last commit. 2015-07-22 10:25:10 +02:00
Carl Eugen Hoyos
35b33f1a19 lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input. 2015-07-22 10:23:18 +02:00
Michael Niedermayer
0671dc5c53 avformat/asfdec_f: Improve packet resync heuristic 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:30:02 +02:00
Michael Niedermayer
5d79a07316 avformat/asfdec_f: Do not print errors if packets do not start with ECC 
There is nothing wrong with such packets, the spec allows this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:21:17 +02:00
Michael Niedermayer
385eb066ce avformat/asfdec_f: Increase the amount of information provided in cases of errors 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:08:34 +02:00
Zhang Rui
830d3a0ebe avformat/async: rename async_interrupt_callback to async_check_interrupt 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 21:19:05 +02:00
Zhang Rui
5e2098d906 avformat/async: fix interrupt_callback usage and return code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 21:18:48 +02:00
Michael Niedermayer
f2d7409c72 avformat/async: Add missing else 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 17:04:11 +02:00
Zhang Rui
aee909acfb fate: add test for async protocol 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 15:19:42 +02:00
Michael Niedermayer
e5bae39f46 Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b' 
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 00:54:42 +02:00
Vittorio Giovara
5d3addb937 Add a quality factor packet side data 
This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-20 15:06:47 +01:00
Michael Niedermayer
cb53db144c avformat/mp3dec: Rename sync() function to avoid build failure on android 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:41:44 +02:00
Michael Niedermayer
bf1fd59c6a avformat/avidec: Fix demuxing avi with broken index 
Fixes: genio-avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:11:49 +02:00
Carl Eugen Hoyos
32d8726a31 lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two. 2015-07-20 00:27:52 +02:00
James Almer
2db8c42ddc avformat/mp3dec: remove unused variable 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-19 17:47:28 -03:00
Vesselin Bontchev
0a551cbe97 Add support for Audible AAX (and AAX+) files 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 20:28:39 +02:00
Michael Niedermayer
4df66c7cd6 avformat/mp3dec: split position sync code out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 19:31:08 +02:00
Michael Niedermayer
3d4297f851 Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57' 
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
  asfdec: make nb_sub to be unsigned int

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:52:35 +02:00
Michael Niedermayer
74aba00700 Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406' 
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
  asfdec: read the replicated data in a separate function

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:45:08 +02:00
Michael Niedermayer
80a37fc3e1 Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68' 
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
  asfdec: convert condition for the replicated data reading to be safer

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:29:55 +02:00
Michael Niedermayer
f509c9503a Merge commit '406627287e015ce381795e85e2557b12bf60ca35' 
* commit '406627287e015ce381795e85e2557b12bf60ca35':
  asfdec: do not read replicated data when their length is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:23:01 +02:00
Alexandra Hájková
e61f39849c asfdec: make nb_sub to be unsigned int 
number of subpayloads should be always positive

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:20:01 +02:00
Alexandra Hájková
2883ef34b5 asfdec: read the replicated data in a separate function 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:18:27 +02:00
Alexandra Hájková
0989d3ad1f asfdec: convert condition for the replicated data reading to be safer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:16:28 +02:00
Alexandra Hájková
406627287e asfdec: do not read replicated data when their length is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 08:59:48 +02:00
Michael Niedermayer
b5e716ae13 avformat/mpegtsenc: Add sdt_period, similar to pat_period 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 23:26:05 +02:00
Michael Niedermayer
34da54fd1a avformat/mpegtsenc: Support a user specified PAT/PMT period 
Can be used to fix Ticket3714

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:24:25 +02:00
Michael Niedermayer
a9c1545a33 avformat/mpegtsenc: support storing PAT/PMT per frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:19:19 +02:00
Michael Niedermayer
a194298954 avformat/movenc: Drop redundant bit exact field from context 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 13:27:33 +02:00
Ganesh Ajjanagadde
f6870495e1 avformat: increase first_frames threshold for mp3,ac3 
Fixes Ticket4723

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 04:52:49 +02:00
Zhang Rui
f477a3f5ab avformat/async: support filling with a background thread. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:46:50 +02:00
Vittorio Giovara
f1840b070d Revert "mov: Double-check that alias path is not an absolute path" 
This reverts commit 9286de0459.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
 2015-07-17 01:44:22 +01:00
Marton Balint
c8ec2109f9 avformat: bump micro version after adding concatdec features 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
5117b5e9aa concatdec: add support for injecting packet metadata 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
25a6711c25 concatdec: add support for specifying outpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
12d82004c5 concatdec: store eof condition in context 
This is needed later for outpoint support which may leave the last file in a
not-eof state.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
7ff0137a1f concatdec: add support for specifying inpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
53f2ef2c4a mxfdec: calculate the index in display order 
This should fix seeking for open GOP files as well.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-16 22:07:49 +02:00
Luca Barbato
4512ee78e1 mpegts: Mark the muxer as supporting variable fps 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-15 19:43:48 +02:00
Michael Niedermayer
4afc3429be avformat/utils: Fix regression with H264 stream probing 
Fixes Ticket4725

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-16 03:37:43 +02:00
Michael Niedermayer
cdca400c5e avformat/utils: Print stream number in max_analyze_duration exit path 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-16 03:30:24 +02:00
Carl Eugen Hoyos
9901e53187 lavf/rtpenc_jpeg: Fix sending multiple quantization tables. 2015-07-16 00:36:13 +02:00
Donny Yang
99b0cadd13 apng: Fix wrong default final frame delay in muxer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 22:52:06 +02:00
Michael Niedermayer
1680f9c588 Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e' 
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 21:29:12 +02:00
Michael Niedermayer
8f2c045a0e avformat/mov: Implement a same origin policy for references instead of only allowing a subset of relative pathes in references 
Fixes Ticket4671

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 12:47:09 +02:00
Michael Niedermayer
90dd6ad22c avformat/utils: inform the user if the protocol cannot be determined 
Assuming the wrong protocol can lead to suboptimal seeking performance

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 04:09:09 +02:00
Michael Niedermayer
901922e047 avformat/utils: adjust short skip threshold in ff_configure_buffers_for_index() to avoid seeking if a packet is skiped 
Fixes Ticket4126

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 03:35:08 +02:00
Michael Niedermayer
c9c7263e58 avformat/mov: Fix opening relative references 
Possibly fixes Ticket4671

the removed check is wrong and insufficient

Based on patch by Maksym Veremeyenko <verem@m1.tv>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 01:12:45 +02:00
wm4
130a8e0eef avformat: don't crash API users when demuxing mp4 
This code is one big chunk of WTF.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 22:41:35 +02:00
Michael Niedermayer
15629129dd avformat/mov: Fix deallocation when MOVStreamContext failed to allocate 
Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 14:15:42 +02:00
Michael Niedermayer
db1ab7e5af Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d' 
* commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d':
  asfdec: prevent memory leaks found with Coverity Scan

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 00:54:55 +02:00
Michael Niedermayer
32d023eb6d avformat/oggdec: Check buf before copying data in to it 
Fixes null pointer dereference
Fixes: aace024653cc62947336b86f8de812ab_signal_sigsegv_a0500f_343_WobblyWindowsIntro.ogg with memlimit 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 22:10:24 +02:00
Luca Barbato
a5a6a786bf mp3: Forward seeking errors 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-13 21:59:53 +02:00
Alexandra Hájková
c571424c7f asfdec: prevent memory leaks found with Coverity Scan 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-13 20:27:34 +02:00
Michael Niedermayer
b513661251 avformat/utils: Skip ff_configure_buffers_for_index() for local files 
Theres no known case where its use on local files improves performance
if you know of such a case, please contact us

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 14:27:02 +02:00
Michael Niedermayer
488cc05192 avformat/mov: Use ff_configure_buffers_for_index() 
Fixes Ticket2513
Fixes Ticket4432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
Michael Niedermayer
b183fb4767 avformat: Add ff_configure_buffers_for_index() 
This allows configuring the io buffer in such way that few seeks are needed for playback

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
Ganesh Ajjanagadde
4547cf68a0 avformat/isom: utilize bitrate hints 
Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 20:23:58 +02:00
Michael Niedermayer
d2e5297e93 Merge commit '796268654c7807c9a1cfb322c838383e2b900d60' 
* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:34:18 +02:00
Michael Niedermayer
839d6bc192 avformat/riffde: Fix integer overflow in bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:24:20 +02:00
Michael Niedermayer
cd32637741 Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62' 
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cb56
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:23:42 +02:00
Andreas Cadhalpun
189420cb56 riffdec: prevent negative bit rate 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:12:36 +02:00
Michael Niedermayer
7da1f00e79 Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d' 
* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901c4 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:01:31 +02:00
Michael Niedermayer
ba77fb61f7 Merge commit 'd80811c94e068085aab797f9ba35790529126f85' 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:22:37 +02:00
Ronald S. Bultje
3a18d3fa04 ivfenc: write duration at end-of-stream. 
At the beginning, the value is not initialized.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 13:56:50 +02:00
Hendrik Leppkes
796268654c asfdec: always reset packet state after seeking 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-12 13:24:23 +02:00
Michael Niedermayer
cdb0d7e439 avformat/brstm: Remove unused variable 
Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 12:17:40 +02:00
Michael Niedermayer
944a1aa3c5 avformat/yuv4mpegdec: Use 64bit for file offset 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 00:00:21 +02:00
Paul B Mahol
3666974230 avformat/yuv4mpegdec: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-11 19:31:04 +00:00
Andreas Cadhalpun
f1bdc23437 riff: Validate bitrate 2015-07-11 18:45:45 +02:00
Luca Barbato
c1d647b15a mp3: Make the seek more robust 
Try to parse up to 4 packets to find the closest packet.

Reported-By: jan.schlueter@ofai.at
 2015-07-11 18:45:45 +02:00
Luca Barbato
d80811c94e riff: Use the correct logging context 2015-07-11 18:45:44 +02:00
Michael Niedermayer
9b8b804cfb avformat/yuv4mpegdec: Remove unused variables 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:49:55 +02:00
Ronald S. Bultje
733c5d889b yuv4mpeg: add rough duration estimate and seeking. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:46:19 +02:00
Michael Niedermayer
72527d9c54 Merge commit '872fab4a3df48e7e6484333ee2228c684e319634' 
* commit '872fab4a3df48e7e6484333ee2228c684e319634':
  asfdec: Fix reading from the pipe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-10 20:47:46 +02:00
Alexandra Hájková
872fab4a3d asfdec: Fix reading from the pipe 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-10 13:25:02 +02:00
Carl Eugen Hoyos
e786e96be7 lavf/rtpenc_jpeg: Error out for non-standard Huffman tables. 
Related to ticket #3823.
 2015-07-09 20:03:38 +02:00
Carl Eugen Hoyos
ad7c5cba4e lavf/rtpenc_jpeg: Do not check the table number when checking precision. 2015-07-09 20:00:31 +02:00
Carl Eugen Hoyos
6253f511e0 Cosmetics: Reindent after last commit. 2015-07-09 19:52:06 +02:00
Carl Eugen Hoyos
da46370e94 lavf/matroskaenc: Do not needlessly allocate memory for cuepoints. 
Fixes ticket #4690.
 2015-07-09 19:49:37 +02:00
Michael Niedermayer
b457da4ce2 Merge commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e' 
* commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e':
  lavf/hevc: pad the RBSP buffer as required by the bistream reader

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 03:54:31 +02:00
Chris Watkins
4f5c2e651a oggparsedirac: check return value of init_get_bits 
If init_get_bits fails the GetBitContext is invalid and must not be
used. Check the return value in dirac_header and propogate the error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 03:46:37 +02:00
compn
0054d5ac02 avformat/movenc: fix mime-types in movenc.c 
https://developer.apple.com/library/ios/documentation/AppleApplications/Reference/SafariWebContent/CreatingContentforSafarioniPhone/CreatingContentforSafarioniPhone.html

says video/mp4

suggested by BBB on irc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 02:17:35 +02:00
Michael Niedermayer
17498b70d8 Merge commit '161a301d44274645c2272855dac3e4664f935603' 
* commit '161a301d44274645c2272855dac3e4664f935603':
  mpjpeg: Write the Content-length

Conflicts:
	libavformat/mpjpeg.c

See: 0d2f4eedc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 00:11:32 +02:00
Michael Niedermayer
2a33dc2cdf Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212' 
* commit 'd09b4cce21cdad5ef2855698395ffd6e37445212':
  mpjpeg: Simplify using avio_printf

Conflicts:
	libavformat/mpjpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-08 23:53:08 +02:00
Anton Khirnov
0e7c0ec344 lavf/hevc: pad the RBSP buffer as required by the bistream reader 2015-07-08 23:36:10 +02:00
Michael Niedermayer
656e9a68c4 avformat/swfdec: Fix "}else" style 
Found-by: durandal_170
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-08 12:06:17 +02:00
Michael Niedermayer
6a1204a1a4 avformat/swfdec: Do not error out on pixel format changes 
Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-08 02:43:02 +02:00
Carl Eugen Hoyos
1d5edad8cc lavf/mpegtsenc: Only fail aac muxing if the first frame is invalid. 
Fixes ticket #3957.
 2015-07-07 10:44:46 +02:00
Frank Heckenbach
161a301d44 mpjpeg: Write the Content-length 2015-07-04 00:51:03 +02:00
Luca Barbato
d09b4cce21 mpjpeg: Simplify using avio_printf 2015-07-04 00:46:44 +02:00
Vittorio Giovara
f046c3b5ac lavc: Move deprecation warning disabling to files including the table 
Unbreak build from 7a5902c556.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 21:02:50 +02:00
Paul B Mahol
5233f2534c avformat/yuv4mpegenc: use avio_printf() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 18:43:21 +00:00
Michael Niedermayer
3b03186d56 Merge commit 'f046c3b5ac36848cce824b008e0347c621523041' 
* commit 'f046c3b5ac36848cce824b008e0347c621523041':
  lavc: Move deprecation warning disabling to files including the table
  lavc: Disable deprectation warnings coming from options table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 21:40:47 +02:00
Michael Niedermayer
30ffbeb04a Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00' 
* commit '016cac75c6061a1c03f812ddf258b8baefe70b00':
  asfdec: prevent the infinite loop in detect unknown_subobject

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 03:58:33 +02:00
Michael Niedermayer
7755a57440 Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856' 
* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856':
  asfdec: prevent possible memory leak in the asf_read_metadata_obj

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 03:51:00 +02:00
Alexandra Hájková
016cac75c6 asfdec: prevent the infinite loop in detect unknown_subobject 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 01:50:09 +02:00
Alexandra Hájková
9752d2e6cc asfdec: prevent possible memory leak in the asf_read_metadata_obj 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 01:50:09 +02:00
Michael Niedermayer
1f69b7baa1 avformat/asfdec_f: Fix memleak 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 09:42:33 +02:00
John Adlum
72cad80016 avformat/asfdec_f: Add ASFDataType, use named types for metadata 
This is based on asfdec_o.c, but uses a proper type instead of defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:27 +02:00
John Adlum
59fffefdb4 avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:23 +02:00
John Adlum
c8eca438a9 avformat/asfdec_f: factor error checking out of main header parsing loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:18 +02:00
Michael Niedermayer
838c5f3df7 avformat/utils: Redesign scoring in av_find_default_stream_index() 
This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...

Fixes Ticket2687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 22:51:48 +02:00
Paul B Mahol
5165c600eb avformat/rtmpproto: increase hardcoded url/path lengths 
Fixes #4103.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 20:03:26 +00:00
John Adlum
811008b8ee avformat/asfdec_f: Assert that packet positions match in asf_read_pts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:47:59 +02:00
John Adlum
28206b75e8 avformat/asfdec_f: Correct skip to key code 
Fixes Ticket3978

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:47:54 +02:00
Vadim Belov
db64af6395 avformat/concatdec: copy stream metadata when using concat 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 14:43:31 +02:00
Michael Niedermayer
60ec3007e6 avformat/nutdec: Check ff_gen_search() for failure 
Fixes assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 14:28:41 +02:00
Michael Niedermayer
2f8c81637c avformat/matroskadec: Fix undefined shift in read_sint() 
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 12:00:43 +02:00
Michael Niedermayer
55a04a5d7a Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f' 
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
  mov: Log format rather than fourcc in stsd in trace mode

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 04:15:27 +02:00
Michael Niedermayer
35c8dda5c2 Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1' 
* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
  mov: Adjust variable types to fix format warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 04:06:42 +02:00
Michael Niedermayer
a8e137a322 Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a' 
* commit 'df22e30172b09cda4d6f7d4f43508284be65848a':
  dump: Use the correct abs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 03:51:56 +02:00
Vittorio Giovara
a1e2caa93e mov: Log format rather than fourcc in stsd in trace mode 
This will fix remaining format warnings.
 2015-07-01 00:13:58 +01:00
Vittorio Giovara
2eef75fd7e mov: Adjust variable types to fix format warnings 2015-07-01 00:13:58 +01:00
Vittorio Giovara
df22e30172 dump: Use the correct abs() version 
Fix warning from clang "absolute value function 'abs' given an argument
of type 'long long' but has parameter of type 'int' which may cause
truncation of value [-Wabsolute-value]".
 2015-07-01 00:13:58 +01:00
Michael Niedermayer
cfcb9f5e36 Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a' 
* commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
	libavformat/movenc.c
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4

See: a17ee4117d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 21:47:58 +02:00
Luca Barbato
e95c7a6185 mov: Preserve the metadata even when bit-exactness is requested 
Make sure to not write the custom `encoder` string in that case.

Bug-Id: 845
CC: libav-stable@libav.org
 2015-06-30 15:34:38 +02:00
John Högberg
42bc768e52 mpegts: Add jpeg2000 stream type 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-30 10:08:16 +02:00
Michael Niedermayer
088b410ea2 Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258' 
* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
  mpegts: Add jpeg2000 stream type

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 13:08:26 +02:00
Michael Niedermayer
6d9dfb1267 Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501' 
* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
  riff: Validate the wav header size before trying to parse it

Conflicts:
	libavformat/riffdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 12:59:16 +02:00
Michael Niedermayer
3cd6b6aa0f Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68' 
* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
  asf: Do not skip data streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 12:48:11 +02:00
Michael Niedermayer
0d5a27c2b5 Rename asfdec-o.c to asfdec_o.c 
Most files use _ instead of - as spacer, so this is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 12:23:44 +02:00
Michael Niedermayer
8f9c39b3e8 avformat: rename asfdec.c to asfdec_f.c 
leaving it as asfdec.c confuses git

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 12:23:12 +02:00
Michael Niedermayer
e55e5be982 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
  lavf/mpegts: Return 0 if the probe function does not detect mpegts.
  lavf/img2dec: Improve detection of valid Quickdraw images.
  lavf/asfdec: Reduce minimum header size.
  Changelog: Add jpeg 2000 improvements before they get forgotten.
  lavf/img2dec: Autodetect dds frames.

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-29 17:29:13 +02:00
Michael Niedermayer
da8b228977 avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace 
This was suggested in the discussion about these functions

With this change the functions are available internally but are not
part of the public API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-29 16:30:43 +02:00
Carl Eugen Hoyos
4b920d7b4a lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp. 
Reduces console spamming on debug level.
 2015-06-29 16:29:07 +02:00
Carl Eugen Hoyos
77c0b149be lavf/mpegts: Return 0 if the probe function does not detect mpegts. 
Reduces console spamming on debug level.
 2015-06-29 16:27:36 +02:00
Carl Eugen Hoyos
dee7943819 lavf/img2dec: Improve detection of valid Quickdraw images. 
Detect Quickdraw images without application header with
lower score.
 2015-06-29 16:25:11 +02:00
Carl Eugen Hoyos
5a458420e2 lavf/asfdec: Reduce minimum header size. 
Fixes GipsyGuitar.wmv mentioned in ticket #1477.
 2015-06-29 16:23:15 +02:00
Carl Eugen Hoyos
a876a4da4a lavf/img2dec: Autodetect dds frames. 2015-06-29 16:13:26 +02:00
Michael Niedermayer
4ccd2b31f0 avformat/asfdec: Allow packet_obj_size == 0 
Fixes Ticket3521

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-29 04:57:51 +02:00
Michael Niedermayer
be4e1f28fd avformat/asfdec: Print packet_obj_size in case it is invalid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-29 04:55:06 +02:00
Ludmila Glinskih
ca3b274552 api-h264-test: build with another api test 
Location of api-h264-test changed to special directory for api tests.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-29 02:49:32 +02:00
Michael Niedermayer
a5f617e9ec avformat/asfdec: Print a warning if data is skiped due to less than a frame header being left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 23:22:31 +02:00
Michael Niedermayer
4b0a475846 avformat/asfdec: Reduce FRAME_HEADER_SIZE to 11 
This fixes demuxing of screen_codec.wmv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 23:22:31 +02:00
Luca Barbato
1b4c468477 riff: Validate the wav header size before trying to parse it 2015-06-28 17:32:40 +02:00
Luca Barbato
5bdfc17189 asf: Do not skip data streams 2015-06-28 17:10:54 +02:00
Michael Niedermayer
a57ee6cca1 Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc' 
* commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc':
  mpjpeg: Check stream allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 13:41:44 +02:00
Michael Niedermayer
30b8f3e7dc Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d' 
* commit 'b08569a23948db107e5e6175cd4c695427d5339d':
  lavf: Replace the ASF demuxer

Conflicts:
	Changelog
	libavformat/asf.h
	libavformat/asfdec.c
	libavformat/version.h
	tests/ref/fate/wmv8-drm-nodec
	tests/ref/seek/lavf-asf

The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 13:36:54 +02:00
Michael Niedermayer
da06169850 avformat/riffdec: Forward error code from avio_read() in ff_get_guid() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 13:04:47 +02:00
Luca Barbato
8a26ae5f94 mpjpeg: Check stream allocation 
Bug-Id: CID 1308152
 2015-06-28 10:27:19 +02:00
Alexandra Hájková
b08569a239 lavf: Replace the ASF demuxer 
The old one is the result of the reverse engineering and guesswork.
The new one has been written following the now-available specification.

This work is part of Outreach Program for Women Summer 2014 activities
for the Libav project.

The fate references had to be changed because the old demuxer truncates
the last frame in some cases, the new one handles it properly.
The seek-test reference is changed because seeking works differently
in the new demuxer. When seeking, the packet is not read from the stream
directly, but it is rather constructed by the demuxer. That is why
position is -1 now in the reference.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-06-28 10:16:40 +02:00
Andreas Cadhalpun
6b9fdf7f4f nutdec: check maxpos in read_sm_data before returning success 
Otherwise sm_size can be larger than size, which results in a negative
packet size.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-27 19:22:27 +02:00
Rodger Combs
68f00fb40b lavf/brstm: if the file lies about the last block's size, correct it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-27 14:15:12 +02:00
schenk michael
b9161ef052 avformat/hls: do not iterate to next sequence number if interruption is requested 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-26 14:36:25 +02:00
Rodger Combs
0643b4bf74 lavf/brstm: expose the loop point when present 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 19:17:01 +02:00
Peter Ross
803bdc5469 electronicarts: demux alpha stream 
Electronic Arts VP6 files may contain two video streams: one for the
primary video stream and another for the alpha mask. The file format
uses identical data structures for both streams.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 12:45:09 +02:00
Peter Ross
a2517fca1e electronicarts: move video stream properties into dedicated structure 
This is required for the alpha stream demux patch.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 12:45:00 +02:00
Ludmila Glinskih
b04c630a3d libavformat: Add H264 API test 
Result differs in pkt_duration and time_base.den for some reason.
Right now it tests only one example (adjusted to match the output).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 04:09:51 +02:00
Michael Niedermayer
4107092349 Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b' 
* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
  segafilm: Remove deplanarization hack

Conflicts:
	libavformat/segafilm.c
	libavformat/version.h

See: 42b8f5fba1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 20:51:22 +02:00
James Almer
58d7dde081 brstm: fix use of uninitialized variables 
Fixes valgrind complaining about "Conditional jump or move depends on uninitialised value(s)"

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-24 14:31:54 -03:00
Paul B Mahol
ded5957d75 segafilm: Remove deplanarization hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-24 14:45:09 +01:00
Paul B Mahol
5a79bf0284 PCM signed 16-bit big-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-24 14:45:00 +01:00
Mariusz Szczepańczyk
346624be4a lavf: set is_connected flag so url can be properly closed 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 15:40:03 +02:00
Michael Niedermayer
041aa800f2 avformat/mp3dec: Remove the ID3v1 tag removial code 
The code is simply broken, the read packets are not aligned to
the mp3 frames, the file end or the id3 tag thus this simply
cannot reliably find the ID3v1 tag to remove it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 02:52:11 +02:00
Mariusz Szczepańczyk
b23d2bac0d lavf/libssh: implement move and delete callbacks 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:44:09 +02:00
Mariusz Szczepańczyk
0cce94fb10 lavf/libssh: read empty path from url as / 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:43:17 +02:00
Lukasz Marek
e96f0a692b lavf/libssh: implement directory listing callbacks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:42:55 +02:00
Mariusz Szczepańczyk
71034163ac lavf/libsmbclient: implement move and delete callbacks 
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:25:24 +02:00
Michael Niedermayer
b64e70436e avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6 
Suggested-by: Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 03:42:12 +02:00
Stephan Vedder
b368428fc0 avformat/electronicarts: Fixed ea_probe function to accept vp6a videos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 03:34:33 +02:00
Michael Niedermayer
ff68b83968 Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' 
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 23:34:56 +02:00
Michael Niedermayer
55219a78c7 Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7' 
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 22:47:32 +02:00
Vittorio Giovara
5c018ee188 DirectDraw Surface image decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00
Vittorio Giovara
7ca3e5203f Hap decoder and encoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00
Mariusz Szczepańczyk
824a82d1b8 lavf/file: implement move and delete callbacks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 12:46:18 +02:00
Mariusz Szczepańczyk
80e18bb486 lavf/avio: Extend API with avio_move() and avio_delete() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 12:46:08 +02:00
Luca Barbato
61dc9d647c udp: Fix local_port management 
The default value for unset is -1, not 0.

Problem introduced in 66028b7ba6
 2015-06-22 10:47:29 +03:00
Michael Niedermayer
ae215e2b42 Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' 
* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
	libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 20:32:06 +02:00
Paul B Mahol
a49154e9d7 avformat/brstm: support little-endian s16 PCM 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-21 10:32:13 +00:00
Rodger Combs
d2ce10093e lavf/brstm: handle a BFSTM endianness oddity 2015-06-21 10:32:13 +00:00
Rodger Combs
9c9cf3956c lavf/brstm: add support for seeking 2015-06-21 10:32:12 +00:00
Rodger Combs
70a39bcf1c lavf/brstm: cleanup; fix short-block demuxing 2015-06-21 10:32:12 +00:00
Rodger Combs
6c56827e62 lavf/brstm: move bfstm var to a local 2015-06-21 10:32:12 +00:00
Michael Niedermayer
6c8a05268c avformat/rawenc: Store sample number for ADX 
Fixes Ticket4540

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 12:16:24 +02:00
Paul B Mahol
95ee0fbacf Support demuxing 4gv codec stored in qcp files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-21 09:30:01 +00:00
Michael Niedermayer
f98c3ec5c6 avformat/movenc: Check return code of ff_iso8601_to_unix_time() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 04:18:08 +02:00
Rodger Combs
db426031dd lavf/brstm: allow larger block sizes 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 19:21:08 +02:00
Rodger Combs
d4c9eced98 lavf/brstm: support little-endian files (BCSTM; 3DS) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 16:50:47 +02:00
nu774
6ec688e1bc mp3: enable packed main_data decoding in MP4 
14496-3 suggests packing main_data of MP3 that is usually scattered
into multiple frames due to bit reservoir.

However, after packing main_data into a access unit, bitrate index
in the MPEG audio frame header doesn't match with actual frame size.

In order to accept this, this patch removes unnecessary frame size
checking on mp3 decoder.

Also, mov demuxer was changed to use MP3 parser only on special cases
(QT MOV with specific sample description) to avoid re-packetizing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-20 12:18:01 +03:00
wm4
f6c3f1ed60 avformat: clarify what package needs to be compiled with SSL support 
Try to reduce user confusion.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-18 22:26:36 +02:00
wm4
d4007d1763 id3v2: strip trailing spaces from APIC tag 
The APIC description must be unique, and some ID3v2 tag writers add
spaces to write several APIC entries with the same description. The
trailing spaces simply serve as a way to disambiguate the description.
Do this so that API users do not have to special-case mp3 to fix this
cosmetic issue.

Requested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-18 19:15:49 +02:00
Michael Niedermayer
622f1468c9 avformat/id3v2: detect PNG by header instead of mime 
the mimetype for PNG can be set to jpeg

Fixes 01\ -\ Cider\ Time.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-18 18:38:53 +02:00
Rodger Combs
bb42a7d4d4 lavf/brstm: add support for BFSTM files 
Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-17 13:24:11 +02:00
wm4
dc87758775 avio: fix potential crashes when combining ffio_ensure_seekback + crc 
Calling ffio_ensure_seekback() if ffio_init_checksum() has been called
on the same context can lead to out of bounds memory accesses and
crashes. The reason is that ffio_ensure_seekback() does not update
checksum_ptr after reallocating the buffer, resulting in a dangling
pointer.

This effectively fixes potential crashes when opening mp3 files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-17 01:13:19 +02:00
Andreas Cadhalpun
28efeb6502 doc: avoid incorrect phrase 'allows to' 
Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-16 21:48:51 +02:00
Andreas Cadhalpun
92e79a2f7b matroskadec: validate audio channels and bitdepth 
In the TTA extradata re-construction the values are written with
avio_wl16 and if they don't fit into uint16_t, this triggers an
av_assert2 in avio_w8.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-16 21:46:04 +02:00
Andreas Cadhalpun
5b76c82fd7 matroskadec: check audio sample rate 
And default to 8000 if it is invalid.

An invalid sample rate can trigger av_assert2 in av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-16 21:45:45 +02:00
Christian Suloway
7e871d6999 avformat/hlsenc: removed empty/unused print_encryption_tag function 
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-16 16:52:38 +02:00
Michael Niedermayer
cf11fd632e avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12 
This should make no difference as the byte is ignored

Found-by: tim nicholson <nichot20@yahoo.com>
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-16 13:28:44 +02:00
Christian Suloway
907ac20aa2 avformat/hlsenc: added HLS encryption 
Added HLS encryption with -hls_key_info_file <key_info_file> option. The
first line of key_info_file specifies the key URI written to the
playlist. The key URL is used to access the encryption key during
playback. The second line specifies the path to the key file used to
obtain the key during the encryption process. The key file is read as a
single packed array of 16 octets in binary format. The optional third
line specifies the initialization vector (IV) as a hexadecimal string to
be used instead of the segment sequence number (default) for encryption.
Changes to key_info_file will result in segment encryption with the new
key/IV and an entry in the playlist for the new key URI/IV.

Key info file format:
<key URI>
<key file path>
<IV> (optional)

Example key URIs:
http://server/file.key
/path/to/file.key
file.key

Example key file paths:
file.key
/path/to/file.key

Example IV:
0123456789ABCDEF0123456789ABCDEF

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo
foo.m3u8

file.keyinfo:
http://server/file.key
/path/to/file.key
0123456789ABCDEF0123456789ABCDEF

Example shell script:
BASE_URL=${1:-'.'}
openssl rand 16 > file.key
echo $BASE_URL/file.key > file.keyinfo
echo file.key >> file.keyinfo
echo $(openssl rand -hex 16) >> file.keyinfo
ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \
  -hls_key_info_file file.keyinfo out.m3u8
--

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-16 03:25:31 +02:00
Michael Niedermayer
efcf8cfa48 Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07' 
* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
  nut: Drop doxygen markers

Conflicts:
	libavformat/nut.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 21:41:20 +02:00
Michael Niedermayer
c5fc48fdfb Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0' 
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 21:18:13 +02:00
Luca Barbato
24ad3ac6a3 nut: Drop doxygen markers 2015-06-15 13:39:07 +02:00
Vittorio Giovara
07b2db81d0 riff: Add MNM4 FourCC as mpeg4 2015-06-15 12:29:25 +01:00
wm4
2222f419da tls_gnutls: fix hang on disconnection 
GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 21:40:08 +02:00