generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,009 Commits 24 Branches 241 Tags
73ea11d721ad59a631b09ff968838f85f7883ed1
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer
74c7273b5d avfilter/vf_framepack: Check and update frame_rate 
The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a46a23d30f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 20:48:09 +01:00
Michael Niedermayer
402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:00:48 +01:00
Vittorio Giovara
a7d0e7ead9 lavfi: add framepack filter 2014-01-09 23:13:05 +01:00