diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:41:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:49:59 +0100 |
| commit | f9fd6f983b979b2da0f9bba3d6b150a302deb1fe (patch) | |
| tree | 6e1f91b358394778f798a4d32b22f8317d93a06e /libavcodec/internal.h | |
| parent | a7f9d92a6d54495f812317abe249582c66efb7b6 (diff) | |
| parent | 2eba9087f3031c6050f8dcd996225490be6c2410 (diff) | |
Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'
* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
lavc: make up a fake frame channel layout when there is no real one.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index eb82d79793..e51757f9d6 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -134,7 +134,7 @@ unsigned int avpriv_toupper4(unsigned int x); /** * does needed setup of pkt_pts/pos and such for (re)get_buffer(); */ -void ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); +int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); void avpriv_color_frame(AVFrame *frame, const int color[4]); |