| Age | Commit message (Collapse) | Author |
|---|
|
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3bf142c77337814458ed8e036796934032d9837f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6cd9a8b67a95a136ea15bfe3c3bab6cf5e6d1cc9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
The amv one probably looks suspicious, but since it's an intra-only
codec, I couldn't possibly imagine what it would use the edge for,
and the vsynth fate result doesn't change, so it's probably OK.
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
FFplay was using a 5 frame packet buffer, this is not much (e.g. 200 ms for
25fps video), when HLS is requesting a new segment via HTTP, it may take longer
for the request to complete.
Should fix ticket #4720.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
external clock
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
It has become unused as all code was switched to AVDictionary
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
The windows SDL audio driver plays the old data in the buffer in a loop if it
is not updated in time. So instead of waiting for data and blocking the the
audio thread, return silence if no data is available.
Should fix ticket #2289.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Fixes some files from Ticket679
This also changes subtitles to 4:2:0 matching the output format and thus
simplifying the blend code.
This restricts placement to the chroma sample resolution though, speak up
if you consider this a problem, say so, the code could be changed to use
YUV444 for subtitles and scaling them down while blending, this would be
slower though.
The current code only uses a single swscale context and reinitializes it
as needed, this could be changed as well if needed
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
* 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>
|
|
* 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>
|
|
Note: {wanted,min,max}_samples are int variables.
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
avplay: Add support for rotated video
Conflicts:
configure
doc/ffplay.texi
ffplay.c
See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
avplay: Factorize code for adding filters to the filter pipeline
Conflicts:
ffplay.c
See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
avplay: Do not print a possibly uninitialized value
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
avplay: Free frame and graph when memory allocation fails
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
avplay: Check memory allocation
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixes null pointer dereference
Found-by: Paweł <pantrombka@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Otherwise we may not flush a decoder when a new stream is opened during an
already eof condition.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
It is better than using simply video clock, because video clock may be NAN.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This helps the user to see the available streams just before the error message
if the stream specifiers do not match.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Also fix the outdated documentation of these options.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Fixes ticket #3762.
|
|
The generic decoder properly flushes the codecs with one null packet as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
It is supported as a codec option, and those are already parsed.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Once the frame queue is full, we will wait anyway.
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
avplay: Always free opts
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
avplay: Always free find_stream_info options
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
On init failure, let's just free it, so next time it will be recreated from
start.
Also fixes Coverity CID 1241515.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
In some cases resize events can happen even during fullscreen, so let's pass
the proper flag to SDL_SetVideoMode.
Fixes ticket #3964.
Reported-by: Jeff Dwork <jeff@reggie.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
