aboutsummaryrefslogtreecommitdiffstats
path: root/tools/fourcc2pixfmt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-08 11:41:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-08 11:41:58 +0200
commitdc318505d010c600f58ab67224940b3dacf97bcd (patch)
tree63842583739b1058f45bba2a6a14e0bea5d961da /tools/fourcc2pixfmt.c
parent1fec361f353cf140a67b28c2d73c3822a89a76d6 (diff)
parent999ccd2d0a43640921088578f138c874f6cc0f8a (diff)
downloadffmpeg-dc318505d010c600f58ab67224940b3dacf97bcd.tar.gz
Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'
* commit '999ccd2d0a43640921088578f138c874f6cc0f8a': tiff: cleanup the error paths Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/fourcc2pixfmt.c')
0 files changed, 0 insertions, 0 deletions