Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jun 2011 03:49:41 +0000 (05:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jun 2011 03:49:58 +0000 (05:49 +0200)
* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
  ffmpeg: merge output_codecs array into AVOutputStream members.
  rtpenc_latm: Consistently use "Libav" in license boilerplate.
  rtsp: Don't pass string pointer as format string to ff_url_join
  mmsh: fixed printf injection bug in mmsh request
  codec-regression: remove pointless -r options for dnxhd

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c
libavformat/rtpenc_latm.c
libavformat/rtsp.c
tests/codec-regression.sh

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -276,9 -262,11 +274,11 @@@ typedef struct AVOutputStream 
      struct AVInputStream *sync_ist; /* input stream to sync against */
      int64_t sync_opts;       /* output frame counter, could be changed to some true timestamp */ //FIXME look at frame_number
      AVBitStreamFilterContext *bitstream_filters;
+     AVCodec *enc;
      /* video only */
      int video_resample;
 -    AVFrame pict_tmp;      /* temporary image for resampling */
 +    AVFrame resample_frame;              /* temporary frame for image resampling */
      struct SwsContext *img_resample_ctx; /* for image resampling */
      int resample_height;
      int resample_width;
Simple merge
Simple merge
Simple merge