aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/jacosub.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 21:01:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 21:19:25 +0100
commitb84cd22a6661d5d1b5fc3660d5ade528b4813aea (patch)
tree5cac6c8fcca90badb397dd816513491eebf5929c /libavcodec/jacosub.h
parent85cabf1ca98fcc502fcf5b8d6bfb6d8061c2caef (diff)
parent446e37dc97e533e37f6aa0a11355124207e3a7f7 (diff)
downloadffmpeg-b84cd22a6661d5d1b5fc3660d5ade528b4813aea.tar.gz
Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'
* commit '446e37dc97e533e37f6aa0a11355124207e3a7f7': vf_fieldorder: remove superfluous get_video_buffer Conflicts: libavfilter/vf_fieldorder.c See: 9b35bee696739eb6774bdba30504c51132e2a934 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jacosub.h')
0 files changed, 0 insertions, 0 deletions