summaryrefslogtreecommitdiffstats
path: root/libhb/hbffmpeg.h
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-12-31 16:54:11 +0000
committerRodeo <[email protected]>2012-12-31 16:54:11 +0000
commit01d1b85d7adecdc588d5450ee43c52809c0b1c3f (patch)
tree4f08f2381a18b4e62c4e5a82d7b610c68e8f1432 /libhb/hbffmpeg.h
parentb96ca4f7de03e2c1b2d6865a0ae65798c1afed6f (diff)
Bump libav to v9_beta3.
Miscellaneous bugfixes and improvements. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hbffmpeg.h')
-rw-r--r--libhb/hbffmpeg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/hbffmpeg.h b/libhb/hbffmpeg.h
index 2de771505..a28e340fa 100644
--- a/libhb/hbffmpeg.h
+++ b/libhb/hbffmpeg.h
@@ -9,7 +9,7 @@
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/imgutils.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
@@ -27,7 +27,7 @@ uint64_t hb_ff_mixdown_xlat(int hb_mixdown, int *downmix_mode);
void hb_ff_set_sample_fmt(AVCodecContext *, AVCodec *, enum AVSampleFormat);
struct SwsContext*
-hb_sws_get_context(int srcW, int srcH, enum PixelFormat srcFormat,
- int dstW, int dstH, enum PixelFormat dstFormat,
+hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
+ int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags);
int hb_avpicture_fill(AVPicture *pic, hb_buffer_t *buf);