Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

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

diff --cc doc/APIchanges
index 45b38ee24ce909bda9b9fb02386825f69774a94b,7b5b19a96b242f7e2b56283dfc1f2d5d0867b6df..4455fbfd4fe8a6d8bc83754b95de3b4d8fc91a75
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,13 -13,10 +15,13 @@@ libavutil:     2012-10-2
  
  API changes, most recent first:
  
- 2014-08-04 - xxxxxxx - lavc 55.72.101 - avcodec.h
- 2014-08-04 - xxxxxxx - lavu 52.95.100 - frame.h
-   Deprecate AVCodecContext.dtg_active_format and use side-data instead
 -2014-08-xx - xxxxxxx - lavc 55.57.2 - avcodec.h
 -2014-08-xx - xxxxxxx - lavu 53.20.0 - frame.h
++2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h
++2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h
+   Deprecate AVCodecContext.dtg_active_format and use side-data instead.
  
 +2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h
 +  Add get_pixels() to AVDCT
 +
  2014-08-xx - xxxxxxx - lavc 55.57.1 - avcodec.h
    Deprecate unused FF_IDCT_IPP define and ipp avcodec option.
    Deprecate unused FF_DEBUG_PTS define and pts avcodec option.

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/mpeg12dec.c
index f4582ef1ec8e9517275ca971fc2734cee312c8d2,c84fd91b60a51aa5c7d750c2fa305b9ffb72d98d..3b769dfb7705c640f3c084c45720d46619d820d0
--- 1/libavcodec/mpeg12dec.c
--- 2/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@@ -2276,23 -2234,9 +2276,23 @@@ static int mpeg_decode_a53_cc(AVCodecCo
  static void mpeg_decode_user_data(AVCodecContext *avctx,
                                    const uint8_t *p, int buf_size)
  {
 +    Mpeg1Context *s = avctx->priv_data;
      const uint8_t *buf_end = p + buf_size;
-     Mpeg1Context *s1   = avctx->priv_data;
+     Mpeg1Context *s1 = avctx->priv_data;
  
 +    if (buf_size > 29){
 +        int i;
 +        for(i=0; i<20; i++)
 +            if (!memcmp(p+i, "\0TMPGEXS\0", 9)){
 +                s->tmpgexs= 1;
 +            }
 +
 +/*        for(i=0; !(!p[i-2] && !p[i-1] && p[i]==1) && i<buf_size; i++){
 +            av_log(avctx, AV_LOG_ERROR, "%c", p[i]);
 +        }
 +            av_log(avctx, AV_LOG_ERROR, "\n");*/
 +    }
 +
      /* we parse the DTG active format information */
      if (buf_end - p >= 5 &&
          p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {

diff --cc libavfilter/vf_showinfo.c
Simple merge

diff --cc libavutil/frame.h
index ca76c6e19f01333a562d17f64bbf3ae482474bb2,8136fb570dccbda0a8524eab653d0bfe9f63d311..6ff372749a0fab96f129a72f6861d80feff76cc6
--- 1/libavutil/frame.h
--- 2/libavutil/frame.h
+++ b/libavutil/frame.h
@@@ -83,8 -83,8 +83,8 @@@ enum AVFrameSideDataType 
       */
      AV_FRAME_DATA_DISPLAYMATRIX,
      /**
-      * Active Format Description data consisting of a single byte as specified in ETSI TS 101 154
-      * using AVActiveFormatDescription enum
+      * Active Format Description data consisting of a single byte as specified
 -     * in ETSI TS 101 154 using enum AVActiveFormatDescription.
++     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
       */
      AV_FRAME_DATA_AFD,
  };