Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'

* commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7':
  sdp: Simplify parsing/conversion of H264 extradata

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

diff --cc libavformat/sdp.c
index f386fcbafed6a15e370d0d4299e38105536a6741,43a50d4da191e952f898df30f2f12b4f5c37e035..802acc5bae0d5c1236ad0174426f98145d905f68
--- 1/libavformat/sdp.c
--- 2/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@@ -217,8 -202,9 +202,9 @@@ static char *extradata2psets(AVCodecCon
              sps_end = r1;
          }
          if (!av_base64_encode(p, MAX_PSET_SIZE - (p - psets), r, r1 - r)) {
 -            av_log(c, AV_LOG_ERROR, "Cannot Base64-encode %td %td!\n", MAX_PSET_SIZE - (p - psets), r1 - r);
 +            av_log(c, AV_LOG_ERROR, "Cannot Base64-encode %"PTRDIFF_SPECIFIER" %"PTRDIFF_SPECIFIER"!\n", MAX_PSET_SIZE - (p - psets), r1 - r);
              av_free(psets);
+             av_free(tmpbuf);
  
              return NULL;
          }