diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:41:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:41:58 +0200 |
| commit | dc318505d010c600f58ab67224940b3dacf97bcd (patch) | |
| tree | 63842583739b1058f45bba2a6a14e0bea5d961da /libavformat/id3v2.c | |
| parent | 1fec361f353cf140a67b28c2d73c3822a89a76d6 (diff) | |
| parent | 999ccd2d0a43640921088578f138c874f6cc0f8a (diff) | |
| download | ffmpeg-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 'libavformat/id3v2.c')
0 files changed, 0 insertions, 0 deletions