diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:36:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:36:31 +0200 |
| commit | 68cce0101df074c41d2f4cfc8a9a36a000a8393e (patch) | |
| tree | 6f96fca57455d332e927d08b93c18cadb82d978e /libavcodec/mpegvideo.h | |
| parent | 9b736f74fc247f438a0aabe046bef6022b569343 (diff) | |
| parent | fa1923f18205410a3b0aa6c0e77cb31443ef340d (diff) | |
Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'
* commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d':
mpegvideo: Move ff_*_rl functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
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 a042dc11c6..a4370bab83 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -48,7 +48,6 @@ #include "parser.h" #include "mpeg12data.h" #include "qpeldsp.h" -#include "rl.h" #include "thread.h" #include "videodsp.h" |