← Back to branch summary

~ubuntu-branches/ubuntu/wily/ffmpeg/wily

« back to all changes in this revision

Viewing changes to libswresample/options.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Reinhard Tartler, Andreas Cadhalpun
  • Date: 2015-07-20 10:23:49 UTC
  • mfrom: (27.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20150720102349-prx70m0x0su1xek6
Tags: 7:2.7.2-1
http://bugs.debian.org/780344
[ Reinhard Tartler ]
* Add myself to uploaders.
* Merge qt-faststart back into 'ffmpeg'.

[ Andreas Cadhalpun ]
* Upload to unstable.
* Import new upstream bugfix release 2.7.2.
   - Make -xerror with multi-threading more robust. (Closes: #780344)
* Enable frei0r, opencv, x264, x265 on x32 and x265 on sparc64.
* Disable x264 on sparc64 due to #792921.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswresample/options.c
49
49
{"in_sample_fmt"        , "set input sample format"     , OFFSET( in_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
50
50
{"osf"                  , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
51
51
{"out_sample_fmt"       , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
52
 
{"tsf"                  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
53
 
{"internal_sample_fmt"  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
 
52
{"tsf"                  , "set internal sample format"  , OFFSET(user_int_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
 
53
{"internal_sample_fmt"  , "set internal sample format"  , OFFSET(user_int_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
54
54
{"icl"                  , "set input channel layout"    , OFFSET(user_in_ch_layout ), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0           }, 0    , INT64_MAX , PARAM, "channel_layout"},
55
55
{"in_channel_layout"    , "set input channel layout"    , OFFSET(user_in_ch_layout ), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0           }, 0    , INT64_MAX , PARAM, "channel_layout"},
56
56
{"ocl"                  , "set output channel layout"   , OFFSET(user_out_ch_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0           }, 0    , INT64_MAX , PARAM, "channel_layout"},