* qatar/master:
rtpdec: Use our own SSRC in the SDES field when sending RRs
Finalize changelog for 0.8 Release
Prepare for 0.8 Release
threads: change the default for threads back to 1
threads: update slice_count and slice_offset from user context
aviocat: Remove useless includes
doc/APIChanges: fill in missing dates and hashes
Revert "avserver: fix build after the next bump."
mpegaudiodec: switch error detection check to AV_EF_BUFFER
lavf: rename fer option and document resulting (f_)err_detect options
lavc: rename err_filter option to err_detect and document it
mpegvideo: fix invalid memory access for small video dimensions
movenc: Reorder entries in the MOVIentry struct, for tigheter packing
rtsp: Remove extern declarations for variables that don't exist
aviocat: Flush the output before closing
Conflicts:
Changelog
RELEASE
libavcodec/mpegaudiodec.c
libavcodec/pthread.c
libavformat/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
snprintf(error,sizeof(error),"Error while opening encoder for output stream #%d:%d - maybe incorrect parameters such as bit_rate, rate, width or height",
{"explode","abort decoding on error recognition",0,AV_OPT_TYPE_CONST,{.dbl=FF_ER_EXPLODE},INT_MIN,INT_MAX,D,"fer"},
{"fpsprobesize","number of frames used to probe fps",OFFSET(fps_probe_size),AV_OPT_TYPE_INT,{.dbl=-1},-1,INT_MAX-1,D},
{"audio_preload","microseconds by which audio packets should be interleaved earlier",OFFSET(audio_preload),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX-1,E},
{"chunk_duration","microseconds for each chunk",OFFSET(max_chunk_duration),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX-1,E},
{"chunk_size","size in bytes for each chunk",OFFSET(max_chunk_size),AV_OPT_TYPE_INT,{.dbl=0},0,INT_MAX-1,E},
/* this is a crutch for avconv, since it cannot deal with identically named options in different contexts.
*toberemovedwhenavconvisfixed*/
{"f_err_detect","set error detection flags (deprecated; use err_detect, save via avconv)",OFFSET(error_recognition),AV_OPT_TYPE_FLAGS,{.dbl=AV_EF_CRCCHECK},INT_MIN,INT_MAX,D,"err_detect"},