aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/srtenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-17 04:41:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-17 04:41:36 +0100
commit3dab9e804afe7f971a2dc6089c5615628fb4d81c (patch)
treee3c848b325d745ef3384705d856239a2d8bf299d /libavformat/srtenc.c
parent3ddf9b5b7750bda97a591272fa0860e53b4f5c4f (diff)
parent1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e (diff)
downloadffmpeg-3dab9e804afe7f971a2dc6089c5615628fb4d81c.tar.gz
Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'
* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e': h264: directly use frames in ff_h264_draw_horiz_band() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions