aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/xsubenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-04 11:21:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-04 11:22:23 +0200
commit8378aae7293575cecad9cccb23226708e2303ccf (patch)
tree9663d737826ec804a19224d80c91c68645e2c3ec /libavcodec/xsubenc.c
parent02a6ee51685eb74f7a878dd49553ecc1f8da9fb2 (diff)
parent6a5bfd4d49e7433f6de869ccfe682940dbca8740 (diff)
downloadffmpeg-8378aae7293575cecad9cccb23226708e2303ccf.tar.gz
Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'
* commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740': atrac: Add missing av_cold See: 852241561d040e0b147b5c866fd4f288324fbe48 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubenc.c')
0 files changed, 0 insertions, 0 deletions