diff options
| author | jstebbins <[email protected]> | 2011-04-28 00:41:39 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-04-28 00:41:39 +0000 |
| commit | 8b65e3d13fbc73d94b0a5b265da23579382c93bf (patch) | |
| tree | 245ff942a37f74ff6845f54d192c1901e10c3b7f /libhb/hb.c | |
| parent | d845d7d9fd637a91235ed3d0e5c6394c6d8a48e3 (diff) | |
libhb: don't use deprecated elements of the FFmpeg/Libav API
HandBrake uses many attributes of the FFmpeg API that are were deprecated
when we did the last bump. Many of them no longer exist in current
FFmpeg/Libav git, or are going to be removed soon.
Replaces them with non-deprecated attributes that already exist in the
build we currently use.
Thanks to Rodeo for the patch.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3964 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hb.c')
| -rw-r--r-- | libhb/hb.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libhb/hb.c b/libhb/hb.c index 411e4bd66..c877ae91e 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -154,43 +154,43 @@ int hb_ff_layout_xlat(int64_t ff_channel_layout, int channels) switch (ff_channel_layout) { - case CH_LAYOUT_MONO: + case AV_CH_LAYOUT_MONO: hb_layout = HB_INPUT_CH_LAYOUT_MONO; break; - case CH_LAYOUT_STEREO: + case AV_CH_LAYOUT_STEREO: hb_layout = HB_INPUT_CH_LAYOUT_STEREO; break; - case CH_LAYOUT_SURROUND: + case AV_CH_LAYOUT_SURROUND: hb_layout = HB_INPUT_CH_LAYOUT_3F; break; - case CH_LAYOUT_4POINT0: + case AV_CH_LAYOUT_4POINT0: hb_layout = HB_INPUT_CH_LAYOUT_3F1R; break; - case CH_LAYOUT_2_2: + case AV_CH_LAYOUT_2_2: hb_layout = HB_INPUT_CH_LAYOUT_2F2R; break; - case CH_LAYOUT_QUAD: + case AV_CH_LAYOUT_QUAD: hb_layout = HB_INPUT_CH_LAYOUT_2F2R; break; - case CH_LAYOUT_5POINT0: + case AV_CH_LAYOUT_5POINT0: hb_layout = HB_INPUT_CH_LAYOUT_3F2R; break; - case CH_LAYOUT_5POINT1: + case AV_CH_LAYOUT_5POINT1: hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; break; - case CH_LAYOUT_5POINT0_BACK: + case AV_CH_LAYOUT_5POINT0_BACK: hb_layout = HB_INPUT_CH_LAYOUT_3F2R; break; - case CH_LAYOUT_5POINT1_BACK: + case AV_CH_LAYOUT_5POINT1_BACK: hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; break; - case CH_LAYOUT_7POINT0: + case AV_CH_LAYOUT_7POINT0: hb_layout = HB_INPUT_CH_LAYOUT_3F4R; break; - case CH_LAYOUT_7POINT1: + case AV_CH_LAYOUT_7POINT1: hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; break; - case CH_LAYOUT_STEREO_DOWNMIX: + case AV_CH_LAYOUT_STEREO_DOWNMIX: hb_layout = HB_INPUT_CH_LAYOUT_STEREO; break; default: |