summaryrefslogtreecommitdiffstats
path: root/fftools
Commit message (Collapse)AuthorAgeFilesLines
* ffplay: use SDL2 audio APIMarton Balint2017-11-061-4/+5
| | | | | | | | It allows us to specify what kind of audio parameter changes are allowed. Should fix ticket #6721. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffmpeg.c: fix code style in seek_to_startPeter Große2017-11-051-2/+5
| | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg.c: fix calculation of input file duration in seek_to_start()Peter Große2017-11-051-2/+2
| | | | | | | | | | | Fixes looping files without audio or when using stream_copy, where ist->nb_samples is not set since no decoding is done. This fixes ticket #5719 and also fixes an endless loop with the sample in ticket #6139. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: only use hardware accelerated SDL texture formatsMarton Balint2017-11-041-4/+12
| | | | | | | | | | | | Typically only a small subset of the SDL texture formats are supported directly by the SDL renderer drivers, the rest is software emulated. It's better if libswscale does the format conversion to a hardware-accelerated texture format instead of SDL. This should fix video render slowdowns with some texture formats after 3bd2228d05a05eab5f91ac00b01efac9cb07649b. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: create the window and the renderer before starting playbackMarton Balint2017-11-041-32/+35
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'James Almer2017-11-011-1/+2
| | | | | | | * commit '908f737d6c2900b5d34319ca6ea1d1cb71221463': cmdutils: Mark conditionally used variable as av_unused Merged-by: James Almer <jamrial@gmail.com>
* ffmpeg: Fix flush packet stream copy input timestamp handlingMark Thompson2017-11-011-2/+2
| | | | | | | Since a7da13474286774cf378c3ea606c19a7c1a0eba3, flush packets are passed to process_input_packet() during stream copy. This modifies the input timestamp handling to ignore them - since they contain no data, timestamps should not be affected.
* Merge commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424'James Almer2017-10-311-3/+3
| | | | | | | * commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424': avconv: Always initialize the opkt struct on streamcopy Merged-by: James Almer <jamrial@gmail.com>
* Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'James Almer2017-10-301-3/+9
| | | | | | | * commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd': avconv: Flush output BSFs when stream copy reaches EOF Merged-by: James Almer <jamrial@gmail.com>
* ffmpeg: Fix stored encoder metadata with -bitexactMichael Niedermayer2017-10-301-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: remove usage of deprecated getter functionsJames Almer2017-10-291-13/+9
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* ffprobe: remove usage of deprecated getter functionsJames Almer2017-10-291-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flagJames Almer2017-10-292-4/+0
| | | | | | | It has no effect whatsoever since the major bump. Replace the flag's documentation to reflect this as well. Signed-off-by: James Almer <jamrial@gmail.com>
* lavf: Remove AVFMT_RAWPICTURE.Carl Eugen Hoyos2017-10-261-40/+0
| | | | Deprecated since October 2015.
* ffserver: Fix off by 1 error in pathMichael Niedermayer2017-10-251-14/+10
| | | | | | Code suggested by ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'James Almer2017-10-232-10/+0
| | | | | | | * commit 'b3739599bda740ac12d3dde31a331b744df99123': lavc: Drop deprecated emu edge functionality Merged-by: James Almer <jamrial@gmail.com>
* ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer ↵Michael Niedermayer2017-10-232-0/+17
| | | | | | and (de/en)coder Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc: drop VDAClément Bœsch2017-10-233-48/+5
| | | | | Deprecated (aka removed) in OSX 10.11, and we have a replacement for it (VideoToolbox).
* ffserver: remove usage of deprecated rc_eq optionJames Almer2017-10-211-3/+1
| | | | The private codec option will be used instead when available.
* ffmpeg: always init output stream before reaping filtersMarton Balint2017-10-181-0/+9
| | | | | | | | | | Otherwise the frame size of the codec is not set in the buffersink. Fixes ticket #6603 and the following simpler case: ffmpeg -c aac -filter_complex "sine=d=0.1,asetnsamples=1025" out.aac Signed-off-by: Marton Balint <cus@passwd.hu>
* ffmpeg: remove hwaccel_lax_profile_check optionJun Zhao2017-10-162-4/+0
| | | | | | | | This has been unused for a long time, and the original purpose has been replaced by the per-stream hwaccel_flags. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.Sasi Inguva2017-10-121-2/+7
| | | | | | | | This is required for FLV files, for which duration_pts comes out to be zero. Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Thomas Mundt <tmundt75@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: always use single threaded decoding for attached picturesMarton Balint2017-10-081-0/+3
| | | | | | | | | | | | | | | | | | Since af1761f7b5b1b72197dc40934953b775c2d951cc ffmpeg waits for a frame in each stream before writing the output header. If we are using threaded decoding for attached pictures, we have to read till EOF to be able to finally flush the decoder and output the decoded frame. This essentially makes ffmpeg buffer all non-attached picture packets, which will cause a "Too many packets buffered for output stream" eventually. By forcing single threaded decoding, we get a frame from a single packet as well and we can avoid the error. Fixes part of ticket #6375: ffmpeg -i 46564100.mp3 -acodec libmp3lame -ab 128k -ac 2 out.mp3 Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* build: fix compilation of tools with OpenCL enabledJames Almer2017-10-031-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524'James Almer2017-10-0117-0/+27478
* commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524': build: Move cli tool sources to a separate subdirectory Merged-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud