diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:47:14 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:47:14 +0300 |
| commit | 58f63670e173c1113ab231850572be303a21faef (patch) | |
| tree | 5249a0ca6dc3250c0cd96516888ef57495aace25 /libavcodec/mpeg_er.h | |
| parent | c39637f36aa3a942efaa098854bd0c2ae612bcd0 (diff) | |
| parent | 8b5007a31b8d1ddbe3661bf45a732336450b7d25 (diff) | |
Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'
* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
mpegvideo: Move ER functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg_er.h')
| -rw-r--r-- | libavcodec/mpeg_er.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg_er.h b/libavcodec/mpeg_er.h index bd74fbb0c8..bb627a4d06 100644 --- a/libavcodec/mpeg_er.h +++ b/libavcodec/mpeg_er.h @@ -21,6 +21,7 @@ #include "mpegvideo.h" +int ff_mpeg_er_init(MpegEncContext *s); void ff_mpeg_er_frame_start(MpegEncContext *s); #endif /* AVCODEC_MPEG_ER_H */ |