• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 53ce9905
    Michael Niedermayer authored
    * qatar/master:
      opt: Add av_opt_set_bin()
      avconv: Display the error returned by avformat_write_header
      rtpenc_chain: Return an error code instead of just a plain pointer
      rtpenc_chain: Free the URLContext on failure
      rtpenc: Expose the ssrc as an avoption
      avprobe: display the codec profile in show_stream()
      avprobe: fix function prototype
      cosmetics: Fix indentation
      avprobe: changelog entry
      avprobe: update documentation
      avprobe: provide JSON output
      avprobe: output proper INI format
      avprobe: improve formatting
      rtmp: fix url parsing
      fate: document TARGET_EXEC and its usage
    
    Conflicts:
    	doc/APIchanges
    	doc/fate.texi
    	doc/ffprobe.texi
    	ffprobe.c
    	libavformat/version.h
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    53ce9905
ffmpeg.c 218 KB