diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-29 11:13:44 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-29 11:13:44 +0200 |
| commit | ecf65c30cf7545c72c0e27b32283fc9c55b03544 (patch) | |
| tree | edaed0920d675856ae7eb9fdf90a7ce5fc9d7d5c /libavformat | |
| parent | 15b26e88cb7c775e0e7a422ab6b088b5690f31ad (diff) | |
| parent | 251cbb44003caf179fb17afbb8a6c56643c2a646 (diff) | |
| download | ffmpeg-ecf65c30cf7545c72c0e27b32283fc9c55b03544.tar.gz | |
Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
h264: create a new header for common h264 definitions
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index f256f67295..80318b8903 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -48,7 +48,7 @@ #include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" #include "libavcodec/dnxhddata.h" -#include "libavcodec/h264dec.h" +#include "libavcodec/h264.h" #include "libavcodec/internal.h" #include "audiointerleave.h" #include "avformat.h" |