diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:17:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:17:49 +0100 |
| commit | 6c3e4e391dc881233e0cb96311da5a48a85a0eaf (patch) | |
| tree | 6e2f02bbca19aaa148c7d901e491d4afab4c63b4 /libavcodec/mpegvideo.h | |
| parent | 72ad824a86233fb0c81a1581a1a7e6468dca6b0f (diff) | |
| parent | f08fefc4d099f2a1f2e3a6db3d340537e601f762 (diff) | |
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
h264: remove a useless svq3 condition
mpegvideo: remove FMT_H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 012e03cd45..8cc50395c9 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -52,7 +52,6 @@ enum OutputFormat { FMT_H261, FMT_H263, FMT_MJPEG, - FMT_H264, }; #define MPEG_BUF_SIZE (16 * 1024) |