diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:52:19 +0100 |
| commit | e28130bcaf48281b431ea611a546e7520bb90dda (patch) | |
| tree | e140a1521940e41ec255f29dfc832c4d641a651e /libavformat | |
| parent | 3e78ceadf913a7a9d027e21f67c6f9767f83996b (diff) | |
| parent | 3cbe1126530449336e2ce59b194bdb8c4eb4abb4 (diff) | |
| download | ffmpeg-e28130bcaf48281b431ea611a546e7520bb90dda.tar.gz | |
Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
dv: Split DV data table declarations into their own header
Conflicts:
libavcodec/dvdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dv.c | 2 | ||||
| -rw-r--r-- | libavformat/dvenc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index 1f47d411c2..f972478f69 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -32,7 +32,7 @@ #include "avformat.h" #include "internal.h" #include "libavcodec/dv_profile.h" -#include "libavcodec/dvdata.h" +#include "libavcodec/dv.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index e37bd23421..43f65c37b9 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -33,7 +33,7 @@ #include "avformat.h" #include "internal.h" #include "libavcodec/dv_profile.h" -#include "libavcodec/dvdata.h" +#include "libavcodec/dv.h" #include "dv.h" #include "libavutil/fifo.h" #include "libavutil/mathematics.h" |