diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:56:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:56:05 +0100 |
| commit | 2bfcd74ad3e331e995755ac865abc370d3e544c8 (patch) | |
| tree | dcdba816d1ad5f5f4687d8aa62beba0519508d21 /libavcodec/g723_1_data.h | |
| parent | 016c00cf68a481000f48ece6c11f622ba65e8045 (diff) | |
| parent | e557584aa7df6ac9f52af7ee7e5c963437da2e2f (diff) | |
| download | ffmpeg-2bfcd74ad3e331e995755ac865abc370d3e544c8.tar.gz | |
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
mpeg12: Move Mpeg1Context declaration to the only place it is used
Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1_data.h')
0 files changed, 0 insertions, 0 deletions