diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:10:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:25:28 +0100 |
| commit | fadf845973aeb47d1b0bf3eac552394fd8a71437 (patch) | |
| tree | bd731686a98d7029926ede1bf8d29cd1a6d55fa7 /libavcodec/libstagefright.cpp | |
| parent | 7af876a93fa8d88818b3e5d0bb27d9afeee3d814 (diff) | |
| parent | 48a4ffa722c0874b251de9d201babed52cef0bcb (diff) | |
| download | ffmpeg-fadf845973aeb47d1b0bf3eac552394fd8a71437.tar.gz | |
Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
asf: K&R formatting cosmetics
vc1dec: use codec_id instead of codec_tag for VC1IMAGE
sh4: drop unused functions
Conflicts:
libavformat/asf.c
libavformat/asfdec.c
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libstagefright.cpp')
0 files changed, 0 insertions, 0 deletions