b3d2035ec3
ffmpeg: use av_err2str()
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 12:11:09 +02:00
45f3d4e63e
ffmpeg: Use correct codec_id for av_parser_change() check
...
No testcase known
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 03:37:32 +02:00
ac0ba6f233
ffmpeg: Check av_parser_change() for failure
...
No testcase known
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 03:37:32 +02:00
c8890941d6
ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE
...
The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material
related to Ticket4778
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 03:37:09 +02:00
15ff3f3fdf
ffmpeg: check avpicture_fill() return value
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 03:18:57 +02:00
229843aa35
Replace av_dlog with ff_dlog.
...
ff_dlog checks compilability, and is non-public. av_dlog is deprecated
and no longer exists if FF_API_DLOG=0.
2015-08-18 10:24:01 -04:00
fbc8eb6857
ffmpeg: use av_buffersrc_add_frame instead of av_buffersrc_add_ref
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-16 18:17:00 +02:00
4ada49f9db
ffmpeg: Use the decoders dimensions in sub2video_get_blank_frame()
...
Fixes Ticket4744 part3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-15 17:41:48 +02:00
bd5d11d9f5
ffmpeg: Use actual frame dimensions in checks in sub2video_update()
...
Fixes Ticket4744 part2
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-15 17:41:48 +02:00
0ac83047f6
ffmpeg: Print sub2video: rectangle coordinates in case of overflows
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-15 17:41:48 +02:00
9c29aa7143
ffmpeg: replace deprecated av_log_ask_for_sample with av_log
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-12 00:14:13 +02:00
6dbaeed6b7
ffmpeg: switch swscale option handling to AVDictionary similar to what the other subsystems use
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-08 14:44:15 +02:00
99f8fc725d
ffmpeg: remove access to private FILE struct members on Windows
...
The FILE struct is opaque in MSVC 2015, and the members of this struct
were never meant to be accessed in any case.
No conditions are known where this check was needed to get characters
from stdin.
2015-08-04 20:05:18 +02:00
2ab5002e3c
ffmpeg: avoid scanf in keyboard command parsing
...
Mixing stdio and low-level IO on stdin is not safe.
2015-08-04 20:04:53 +02:00
d2077c860e
Revert "ffmpeg: modify tty state when stderr is redirected"
...
faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav
This reverts commit 92e62f49cf
2015-07-30 23:49:54 +02:00
92e62f49cf
ffmpeg: modify tty state when stderr is redirected
...
This fixes Ticket2964
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-30 14:31:26 +02:00
8c2f00d590
ffmpeg.c: remove all remaining coded_frame uses
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28 19:52:40 +02:00
cdb0225fa9
ffmpeg: Use side data instead of coded_frame for error[] values
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28 02:22:23 +02:00
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
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
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
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
495eee0123
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
...
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:17:15 +02:00
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
bc3f19641c
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
...
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 15:36:54 +02:00
3b0534efdc
Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'
...
* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
avconv: move the no streams failure to open_output_file()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 14:01:45 +02:00
15fbf3e72a
Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'
...
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
avconv: factor out the output stream initialization
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 13:50:33 +02:00
247f4d1f18
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
...
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
avconv: move handling the 2pass logfile into avconv_opt
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 12:59:05 +02:00
db3e12a828
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
...
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
avconv: set the encoding/decoding_needed flags earlier
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 12:44:07 +02:00
6e80fe1ecd
ffmpeg: Fix cleanup after failed allocation of output_files
...
Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi 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 15:59:11 +02:00
fd4c87fa3b
ffmpeg: Fix crash with ost->last_frame allocation failure
...
Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 13:03:35 +02:00
bd27dc9102
ffmpeg: Fix deallocating input threads with partly failed file allocation
...
Fixes: 18615ff56beedc63a884a8db0678b47c_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 12:42:41 +02:00
503ec7139f
ffmpeg: Fix cleanup with ost = NULL
...
Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 23:34:29 +02:00
2c7f7a690f
ffmpeg: Use av_log to print benchmark output.
2015-07-09 19:58:22 +02:00
4ebb43f19c
ffmpeg: windows: respond to logoff and ctrl+break messages as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 01:00:38 +02:00
bd0f14123f
ffmpeg: only count got_output/errors in decode_error_stat
...
If threading is used, the first (thread_count - 1) packets are read
before any frame/error is returned. Counting this as successful decoding
is wrong, because it also happens when no single frame could be decoded.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-01 00:33:01 +02:00
cd64ead8d9
ffmpeg: exit_on_error if decoding a packet failed
...
This is the second part of the fix for ticket #4370 .
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-01 00:32:50 +02:00
a5f409bcc0
Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'
...
* commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5':
avconv: do not stop processing the input packet on decoding error
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27 20:34:42 +02:00
a50b008227
Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'
...
* commit 'b114f6d48a06a4dad6882bc83e07463905f004c4':
avconv: factor out flushing the filters
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-27 20:22:45 +02:00
8c22143e7e
ffmpeg: Use 2 instead of STDERR_FILENO
...
STDERR_FILENO is not available on windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-25 23:44:06 +02:00
87961eff23
modify exit message when signaled
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-25 14:18:31 +02:00
1bcdac2da3
ffmpeg: log error message when shutting down from too many signals
...
write() suggested by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-25 12:23:29 +02:00
8f0f678f09
ffmpeg: Do not use the data/size of a bitstream filter after failure
...
Found-by: Rodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-24 13:50:02 +02:00
d1050d9950
ffmpeg: Free last_frame instead of just unref
...
Fixes Ticket4611
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-18 05:27:08 +02:00
4fe38441b0
ffmpeg: do not print misleading recommanditions on 1pass vpx encoding
...
Fixes part of Ticket4295
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 23:42:44 +02:00
18833daf9d
ffmpeg: Support copying unknown streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21 18:21:38 +02:00
57e38043de
ffmpeg: Do not copy the display matrix if rotation meta-data is manually added
...
Fixes Ticket4560
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-18 00:52:36 +02:00
b87dd7f82d
ffmpeg: only apply last picture flush code at EOF
...
Fixes Ticket4562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-17 00:34:08 +02:00
77cc0d5b59
ffmpeg: Support preserving the source key frame timings
...
Added option "source" to force_key_frames
2015-05-16 12:55:19 +02:00
3a91a07f15
ffmpeg: Remove another unneeded ost->filter_graph check
...
Fixes CID1241508
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-15 23:46:10 +02:00
670702f91d
ffmpeg: Print an error if avfilter_graph_queue_command() failed
...
Fixes CID1271809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-15 12:41:28 +02:00
da2f156843
ffmpeg: remove unneeded ost->filter check
...
Fixes CID1241508
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-15 12:34:20 +02:00
f5b26fbc2f
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
...
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:39:00 +02:00
e2877bdf38
ffmpeg: remove incorrect network deinit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-28 15:57:21 +02:00
93db2708d3
ffmpeg: Fix null pointer dereference in do_video_out()
...
Fixes: CID1295087
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19 23:44:19 +02:00
959894632a
Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
...
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
avconv: do not overwrite the stream codec context for streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04 00:38:02 +02:00
4d02dfbde4
ffmpeg: Fix extradata allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04 00:02:14 +02:00
6eb6956d06
ffmpeg: Fix indentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 19:39:06 +02:00
98c7729c13
ffmpeg: last frame duplication heuristic
...
This improves the last frames duration with CFR and when the input durations
are inaccurate or missing
Fixes Ticket4119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 19:09:31 +02:00
d768f8f5cf
ffmpeg: Avoid null pointer dereferences
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-02 13:06:00 +02:00
215c2fe0ae
Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'
...
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
avconv: Print the avfilter errors
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-20 20:33:27 +01:00
f063a0b33d
Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'
...
* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
avconv: do not abort immediately if initializing hwaccel fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-10 10:49:48 +01:00
c285937ccc
ffmpeg: comment mpeg4 hack
...
See 3734c3ea51
2015-03-03 20:25:28 +01:00
5ee3a40f1c
ffmpeg: Fix -vstats when coded_frame is not set
...
There are several encoders which do not set coded_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 12:33:44 +01:00
d92c6d82c0
ffmpeg: notify when the thread message queue blocks.
...
This can help finding the source of A-V desync with live input.
2015-02-26 19:19:56 +01:00
508d6a23b4
ffmpeg: allow to set the thread message queue size.
2015-02-26 19:19:56 +01:00
2384933985
ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 11:22:27 +01:00
77f326dc36
ffmpeg: Make CFR frame drop threshold user adjustable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 02:40:41 +01:00
5274860fe2
ffmpeg: remove unused header
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 15:32:11 +00:00
1fa637d2ef
ffmpeg: free_input_threads requires HAVE_PTHREADS
...
Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 14:47:08 +01:00
85d7e02e4a
ffmpeg: allow overriding and amending AVStream->disposition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 01:27:21 +01:00
90c98994f6
ffmpeg: Reduce noisiness of frame clipping in rate convertion
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 03:51:43 +01:00
a582705d15
ffmpeg: Favor filter graph based duration over ost->frame_rate in fps code
...
The fate change adds a last frame with a subtitle not displayed in the previous
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 03:13:16 +01:00
f96148913b
Fix precission typos
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 22:42:42 +01:00
d3d9a00bcd
ffmpeg: Use filter graph output frame rate also for frame duration estimation
...
Previously the duration was sometimes wrong, this addition
limits the value and improves which frames are choosen when
reducing the frame rate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 20:33:08 +01:00
7b32856011
ffmpeg: Maintain higher precision pts between video filter and fps code
...
This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms
Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 19:53:17 +01:00
261e8ccbd1
ffmpeg: drop redundant frame_pts value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 16:42:20 +01:00
bb0344dc55
ffmpeg: improve data stream support
...
This adds data codec/stream handling where previously there was only
audio/video/subtitles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 02:52:04 +01:00
4184d344af
ffmpeg: Add bitrate value under -progress action
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 00:31:08 +01:00
0409155261
ffmpeg: remove unneeded NULL pointer check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 15:55:07 +01:00
6d1a2efb8a
ffmpeg: Clear error message array at init.
...
This avoids printing uninitialized bytes if no error message is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 23:02:30 +01:00
78cb3c069d
ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:10:58 +01:00
627f5658b6
ffmpeg: Use av_freep(), avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 02:56:02 +01:00
cc63da1223
ffmpeg: add sdp_file option
...
Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 02:05:34 +01:00
d2f9aefbde
ffmpeg: Check for subtitle_out malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-15 23:26:54 +01:00
28a6f970f6
ffmpeg: forward r_frame_rate to the muxer in case of stream copy
...
Fixes Ticket3629 part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-14 02:12:49 +01:00
242f1152bf
ffmpeg: drop usage of coded_frame
...
It causes all kinds of problems and there is no code in the muxers that reads
this field
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 03:06:43 +01:00
4c592c3908
ffmpeg: take bsf arguments from the command line
...
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.
The proper solution would be using AVOption, but this is overkill for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 13:11:34 +01:00
98e8a9e2f2
ffmpeg: Print a debug message if the frame parameters mismatch the context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-27 15:47:49 +01:00
33bc81e437
ffmpeg: skip duration cliping for passthrough & drop modes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 20:18:03 +01:00
4e20e94921
ffmpeg: Check duration for overlap and clip in fps cfr/vfr code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 18:36:36 +01:00
c509202590
ffmpeg: Use input packet duration in vfr/cfr code if available and valid
...
Fixes Ticket3052
2014-11-19 18:35:40 +01:00
61fc1cbfbd
ffmpeg: fix printed timestamp for droped frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 13:26:59 +01:00
9f6d48d696
ffmpeg: better CFR frame duplication selection
...
This improves the handling of cases where the frame duration is not known
Fixes Ticket 4119
Fixes Ticket 1578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 05:14:32 +01:00
8b43b0e8b6
ffmpeg: fix variable type for end char
...
fixes warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 03:05:09 +01:00
9421d974bc
ffmpeg: Fix last newline at log level less than "info"
...
Fixes Ticket3058
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-17 04:25:01 +01:00
6ef5e29220
Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'
...
* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
avconv: copy stream-level side data when streamcopying
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 13:14:33 +02:00
2896b98183
Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'
...
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
avconv: Use av_gettime_relative
Conflicts:
ffmpeg.c
See: 76191c08f8
2014-10-24 12:30:55 +02:00
9bdb7a6c1a
ffmpeg: avoid endlessly reading from one input while another is unavailable
...
Testcase in Ticket 4051
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 22:26:32 +02:00
c48e8d9dca
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
...
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
lavc: deprecate unused me_threshold field
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 15:04:42 +02:00
61c6e69709
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
...
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
avconv: check return value
Conflicts:
ffmpeg.c
See: 4930cd13d6
2014-10-17 14:09:15 +02:00
137f7a630b
Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'
...
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
avconv: replace AVCodecContext.time_base with framerate
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:56:44 +02:00
83f84e4c53
ffmpeg: Fix stream copy with initial_padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 03:30:03 +02:00
ac6b5bb834
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
...
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
avconv: Use only audio and video to guess discontinuities
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 02:06:39 +02:00
2284413206
ffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of hard failing
...
Fixes stream copy from tserror270.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-23 01:38:12 +02:00
16de4d927e
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters
...
Fixes Ticket3562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 04:55:58 +02:00
ab84effded
ffmpeg: Copy extradata if it has been initialized later from the encoder
...
Fixes Ticket3909
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-07 03:13:44 +02:00
b01d2a5533
ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter
...
Fixes/works around Ticket3768
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 19:51:58 +02:00
a2dbf379f0
avcodec/dvbsubdec: make compute_edt user settable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 19:51:58 +02:00
31f9c228c0
ffmpeg: Fix missing {} in Stream to Packet side data code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:34:20 +02:00
81a663f49e
Drop remaining unneeded != NULL
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 22:47:45 +02:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
d3a22491c7
ffmpeg: remove 32 channel limit from audio_channels_map
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 05:38:47 +02:00
33fefdb449
ffmpeg: fix streamcopy with side data
...
The issue is that, when the main packet data buffer is changed, streamcopy
uses a temporary new packet to store that buffer, frees the old packet, and
replace it with the new packet.
However, in doing so, it forgets about the side data, which gets freed, but
is still needed and referenced. Then, when the packet gets freed again in
the normal code path, it attempts to free its side data which has already
been freed.
Therefore, simply avoid the first free on side data by removing that side
data from the packet.
Fixes ticket #3773 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 03:43:17 +02:00
097bf149c9
Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'
...
* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d':
avconv: rename output_packet() to process_input_packet()
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:23:30 +02:00
7d03732f7e
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 13:33:44 +02:00
01c17b5224
ffmpeg: Fix copying timebase to muxer context
...
Fixes Ticket3741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 15:51:31 +02:00
8bbadc9b6e
ffmpeg: Use av_stream_get_parser() to avoid ABI issues
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 21:17:20 +02:00
59975de777
ffmpeg: fix integer overflows with sub->*display_time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-12 02:23:48 +02:00
9098f0ecd7
ffmpeg: remove common factors from copied timebase
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 21:51:31 +02:00
8e7c8325d2
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'
...
* commit '3f3232a371cc88696184d9aef1f812656264e56c':
avconv: set the output stream timebase
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 21:44:25 +02:00
4930cd13d6
ffmpeg: check av_opt_set_dict() return
...
Fixes CID1224275
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02 05:53:13 +02:00
6d2df3c00a
ffmpeg: fix deadlock regression in threading error handing
...
Commit fc9c857c
2014-06-27 17:45:38 +02:00
c69f729947
ffmpeg: fix reinitializing with threads while flushing
...
With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost
This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time
Fixes hqx fate with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:09:09 +02:00
7e6cf36453
ffmpeg: fix transcoding dvbsub to dvbsub
...
fix ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22 21:07:40 +02:00
3639343478
ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21 13:21:08 +02:00
afa7ab557a
Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'
...
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
Use av_packet_rescale_ts() to simplify code.
Conflicts:
doc/examples/muxing.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 17:03:58 +02:00
fa0d0fb42e
Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'
...
* commit '71d6551e674c86d07c165439c2bf6613b3892307':
avconv: use the correct variable in comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 12:58:16 +02:00
5ded0b390b
ffmpeg: for h264 we need has_b_frames from the decoder
...
Other solutions welcome
Fixes Ticket3711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14 23:32:08 +02:00
378ad22492
ffmpeg: print values of mismatching has_b_frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14 23:09:21 +02:00
10012fa961
ffmpeg: Fix bitstream filters manipulating AVCodecContext
...
Fixes Ticket3715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14 00:50:50 +02:00
52ce6be86b
Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'
...
* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
avconv: make -shortest work with streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-12 13:13:12 +02:00
27856b2fe9
ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy
...
Fixes Ticket3658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-05 18:37:32 +02:00
0efe3be71d
Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'
...
* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3':
avconv: Report the codec and the encoder separately
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04 20:08:22 +02:00
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
137c5e115b
ffmpeg: try to use the more fitting of the 2 encoder contexts
...
This fixes the interactively enabled encoder debug by pressing 'D'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 19:48:25 +02:00
576654302b
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
2014-06-03 16:05:37 +02:00
2422a7ffe4
Loose mplayer in MPlayer/incoming/
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 16:03:44 +02:00
3e7b4b9fbd
Add direct link to ML in missing_feature_sample()
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:58:27 +02:00
768ef0f19e
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
...
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:24:00 +02:00
a0b2de77ed
ffmpeg: remove "has_b_frames" backpassing
...
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:23:43 +02:00
00dcb10631
ffmpeg: Fix encoder names in printout
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:56 +02:00
0949bbc431
ffmpeg: fix for-muxer AVCodecContext stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:55 +02:00
862120f980
Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'
...
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:53:23 +02:00
a87685d8e8
ffmpeg: add note about why has_b_frame is copied and when it can be removed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:32:50 +02:00
921d5ae3bc
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:30:51 +02:00
9fb45334fc
ffmpeg: copy b frame codec delay back from decoder to demuxer
...
The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:30:15 +02:00
d097935767
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
...
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
avconv: do not use the stream codec context for decoding
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 14:35:53 +02:00
b3f4615081
ffmpeg: fix check for muxing overhead being unknown
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 23:39:54 +02:00
fc9c857c2d
ffmpeg: use thread message API.
2014-05-26 11:40:21 +02:00
Michael Niedermayer
Ronald S. Bultje
Andreas Cadhalpun
Hendrik Leppkes
Ganesh Ajjanagadde
Carl Eugen Hoyos
rogerdpack
Michael Niedermayer
anatolschwarz
Himangi Saraogi
Clément Bœsch
Nicolas George
Paul B Mahol
Christophe Gisquet
Anshul Maheshwari
raxon1s
Simon Thelen
Sergey
Lou Logan