diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:40:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:53:21 +0100 |
| commit | 98275283d52622c16a6d59f508de7d40216e8b63 (patch) | |
| tree | 873811e2460409fc82e7936b2137f86d7884a1b7 /libavcodec/cavs.h | |
| parent | ca95d1b32df1a059be48404a3f1f598725a64d03 (diff) | |
| parent | 5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01 (diff) | |
| download | android_external_ffmpeg-98275283d52622c16a6d59f508de7d40216e8b63.tar.gz android_external_ffmpeg-98275283d52622c16a6d59f508de7d40216e8b63.tar.bz2 android_external_ffmpeg-98275283d52622c16a6d59f508de7d40216e8b63.zip | |
Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'
* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
FATE: add cavs test
cavsdec: export picture type in the output frame
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.h')
| -rw-r--r-- | libavcodec/cavs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 2f033212dd..649a567b41 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -172,7 +172,6 @@ typedef struct AVSContext { int aspect_ratio; int mb_width, mb_height; int width, height; - int pic_type; int stream_revision; ///<0 for samples from 2006, 1 for rm52j encoder int progressive; int pic_structure; |