highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-03-12 15:44:15 +01:00
parent a75f01d7e0 7b89cd20d8
commit 0cfbfaaa12
8 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/frame.c
View File

@@ -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"