← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/writeffmpeg.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/writeffmpeg.c
877
877
                        break;
878
878
                case FFMPEG_MP3:
879
879
                        fmt->audio_codec = CODEC_ID_MP3;
 
880
                        /* fall-through */
880
881
                case FFMPEG_WAV:
881
882
                        fmt->video_codec = CODEC_ID_NONE;
882
883
                        break;
1072
1073
                specs.channels = c->channels;
1073
1074
 
1074
1075
                switch (av_get_packed_sample_fmt(c->sample_fmt)) {
1075
 
                case AV_SAMPLE_FMT_U8:
1076
 
                        specs.format = AUD_FORMAT_U8;
1077
 
                        break;
1078
 
                case AV_SAMPLE_FMT_S16:
1079
 
                        specs.format = AUD_FORMAT_S16;
1080
 
                        break;
1081
 
                case AV_SAMPLE_FMT_S32:
1082
 
                        specs.format = AUD_FORMAT_S32;
1083
 
                        break;
1084
 
                case AV_SAMPLE_FMT_FLT:
1085
 
                        specs.format = AUD_FORMAT_FLOAT32;
1086
 
                        break;
1087
 
                case AV_SAMPLE_FMT_DBL:
1088
 
                        specs.format = AUD_FORMAT_FLOAT64;
1089
 
                        break;
1090
 
                default:
1091
 
                        return -31415;
 
1076
                        case AV_SAMPLE_FMT_U8:
 
1077
                                specs.format = AUD_FORMAT_U8;
 
1078
                                break;
 
1079
                        case AV_SAMPLE_FMT_S16:
 
1080
                                specs.format = AUD_FORMAT_S16;
 
1081
                                break;
 
1082
                        case AV_SAMPLE_FMT_S32:
 
1083
                                specs.format = AUD_FORMAT_S32;
 
1084
                                break;
 
1085
                        case AV_SAMPLE_FMT_FLT:
 
1086
                                specs.format = AUD_FORMAT_FLOAT32;
 
1087
                                break;
 
1088
                        case AV_SAMPLE_FMT_DBL:
 
1089
                                specs.format = AUD_FORMAT_FLOAT64;
 
1090
                                break;
 
1091
                        default:
 
1092
                                return -31415;
1092
1093
                }
1093
1094
 
1094
1095
                specs.rate = rd->ffcodecdata.audio_mixrate;