diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
commit | 0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04 (patch) | |
tree | 041202962161e4fb791cbd9f8ddb98cf90fc9613 /libavutil/frame.c | |
parent | a75f01d7e0bf166a0b443eb15621753619bb8d88 (diff) | |
parent | 7b89cd20d844cbe763ca34e63e99d110043cf241 (diff) | |
download | ffmpeg-streaming-0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04.zip ffmpeg-streaming-0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04.tar.gz |
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.c')
-rw-r--r-- | libavutil/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index ea09bc1..0c48124 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "audioconvert.h" +#include "channel_layout.h" #include "buffer.h" #include "common.h" #include "dict.h" |