diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-29 11:01:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-29 11:01:36 +0200 |
| commit | 15b26e88cb7c775e0e7a422ab6b088b5690f31ad (patch) | |
| tree | a5e2705a74a0ef8f98b51d364fb510169cc7607e /libavcodec/h264_slice.c | |
| parent | 7dda97fb86ff615e6a892052545d955816bb58f6 (diff) | |
| parent | 9df889a5f116c1ee78c2f239e0ba599c492431aa (diff) | |
| download | ffmpeg-15b26e88cb7c775e0e7a422ab6b088b5690f31ad.tar.gz | |
Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
h264: rename h264.[ch] to h264dec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 66e3c885f9..e70f2ee4eb 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -35,7 +35,7 @@ #include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" -#include "h264.h" +#include "h264dec.h" #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" |