RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
74,229 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

17910 Commits

Author SHA1 Message Date
Hendrik Leppkes 2ab827389b Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672' 
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:56 +02:00
Hendrik Leppkes 07094e5e40 Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961' 
* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961':
  asfdec: do not export empty metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:45 +02:00
Hendrik Leppkes 988ddfea5e Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914' 
* commit 'cd4d9df22738e6f147521ccb72c7930db6050914':
  asfdec: free AVDictionaries properly when closing the demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:34:18 +02:00
Vesselin Bontchev 336822edf4 avformat/mov: fix regression in processing .aax files 
Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 03:40:38 +02:00
Stephan Holljes 3240e69de6 lavf/http: Implement server side network code. 
add http_accept,
add http_handshake and move handshake logic there,
handle connection closing.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 75235a2550 lavf/tcp: increase range for listen and call the underlying socket operations accordingly 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 21198155a7 lavf/tcp: add tcp_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 63c07a956b lavf/avio: add avio_accept and avio_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 5125e4b53f lavf/avio: add ffurl_accept and ffurl_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes cf6c871bee lavf/network: split ff_listen_bind into ff_listen and ff_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Alexandra Hájková 33dc1913ab asfdec: remove improper assignement that caused wrong timestamps 
and remove unneeded variable

Sample-Id: https://samples.libav.org/asf-wmv/asf-code-53/movn018.asf

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:10:05 +02:00
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