git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 30ac66a 043b0b9)

author	Clément Bœsch <u@pkh.me>
	Fri, 24 Mar 2017 10:37:44 +0000 (11:37 +0100)
committer	Clément Bœsch <u@pkh.me>
	Fri, 24 Mar 2017 10:40:35 +0000 (11:40 +0100)
commit	71d541751ef10255ec8b179b014246e69a9c060b
tree	91471868e9c4339f46aaecc9a8d74ce5ebe038c5	tree \| snapshot
parent	30ac66abf0995c3a9a6c5370d357e51268b1b69f	commit \| diff
parent	043b0b9fb1481053b712d06d2c5b772f1845b72b	commit \| diff

Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'

* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v

The merge also includes all our own occurences.

Merged-by: Clément Bœsch <u@pkh.me>

doc/ffmpeg.texi	diff1 \|	\|	blob \| history
tests/fate/demux.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/ffmpeg.mak	diff1 \|	\|	blob \| history
tests/fate/fifo-muxer.mak	diff1 \|	\|	blob \| history
tests/fate/filter-audio.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/filter-video.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/h264.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/pcm.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/real.mak	diff1 \|	diff2 \|	blob \| history
tests/fate/video.mak	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.