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
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