* qatar/master:
rtmp: Add support for SWFVerification
api-example: use new video encoding API.
x86: avcodec: Appropriately name files containing only init functions
mpegvideo_mmx_template: drop some commented-out cruft
libavresample: add mix level normalization option
w32pthreads: Add missing #includes to make header compile standalone
rtmp: Gracefully ignore _checkbw errors by tracking them
rtmp: Do not send _checkbw calls as notifications
prores: interlaced ProRes encoding
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/proresenc_kostya.c
libavcodec/w32pthreads.h
libavcodec/x86/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
{"rtmp_pageurl","URL of the web page in which the media was embedded. By default no value will be sent.",OFFSET(pageurl),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC},
{"rtmp_playpath","Stream identifier to play or to publish",OFFSET(playpath),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC|ENC},
{"rtmp_subscribe","Name of live stream to subscribe to. Defaults to rtmp_playpath.",OFFSET(subscribe),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC},
{"rtmp_swfhash","SHA256 hash of the decompressed SWF file (32 bytes).",OFFSET(swfhash),AV_OPT_TYPE_BINARY,.flags=DEC},
{"rtmp_swfsize","Size of the decompressed SWF file, required for SWFVerification.",OFFSET(swfsize),AV_OPT_TYPE_INT,{0},0,INT_MAX,DEC},
{"rtmp_swfurl","URL of the SWF player. By default no value will be sent",OFFSET(swfurl),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC|ENC},
{"rtmp_tcurl","URL of the target stream. Defaults to proto://host[:port]/app.",OFFSET(tcurl),AV_OPT_TYPE_STRING,{.str=NULL},0,0,DEC|ENC},