Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389'

* commit '18c896be3d8e926ef806e7de29c4a168d7763389':
  lavf: extend / improve the AVFormatContext doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/avformat.h
index e87b6f4cbec0e88c20670690c9f688853a9a573d,71ff0fc15b0bf0a9e30b073aab0390ef1ba15ad0..1c44f87837951cdef1d861c468c3084d9873b4b6
--- 1/libavformat/avformat.h
--- 2/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@@ -1101,9 -952,9 +1127,9 @@@ typedef struct AVFormatContext 
      int64_t duration;
  
      /**
-      * Decoding: total stream bitrate in bit/s, 0 if not
+      * Total stream bitrate in bit/s, 0 if not
       * available. Never set it directly if the file_size and the
 -     * duration are known as Libav can compute it automatically.
 +     * duration are known as FFmpeg can compute it automatically.
       */
      int bit_rate;
  
@@@ -1121,13 -972,11 +1147,15 @@@
  #define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
  #define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
  #define AVFMT_FLAG_FLUSH_PACKETS    0x0200 ///< Flush the AVIOContext every packet.
 +#define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
 +#define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 +#define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
 +#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
  
      /**
-      * decoding: size of data to probe; encoding: unused.
+      * Maximum size of the data read from input for determining
+      * the input container format.
+      * Demuxing only, set by the caller before avformat_open_input().
       */
      unsigned int probesize;