ffmpeg/libavfilter
Michael Niedermayer 2905e3ff64 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: add opt_find to AVCodecContext class.
  h264: Complexify frame num gap shortening code
  intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
  Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
  Add minor bumps and APIChanges entries for lavf private options.
  ffmpeg: deprecate -vc and -tvstd
  ffmpeg: use new avformat_open_* API.
  ffserver: use new avformat_open_* API.
  ffprobe: use new avformat_open_* API.
  ffplay: use new avformat_open_* API.
  cmdutils: add opt_default2().
  dict: add AV_DICT_APPEND flag.
  lavf: add avformat_write_header() as a replacement for av_write_header().
  Deprecate av_open_input_* and remove their uses.
  lavf: add avformat_open_input() as a replacement for av_open_input_*
  AVOptions: add av_opt_find() as a replacement for av_find_opt.
  AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
  ffmpeg: don't abuse a global for passing frame size from input to output
  ffmpeg: don't abuse a global for passing pixel format from input to output
  ffmpeg: initialise encoders earlier.

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/h264.c
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-18 05:10:38 +02:00
..
libmpcodecs
x86
Makefile
af_anull.c
allfilters.c
asink_anullsink.c
asrc_anullsrc.c
avcodec.c libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avcodec.h libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avfilter.c
avfilter.h libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avfiltergraph.c
avfiltergraph.h
defaults.c
drawutils.c
drawutils.h
formats.c
gradfun.h
graphparser.c graphparser: add missing NULL check in avfilter_graph_parse() 2011-06-18 02:08:38 +02:00
internal.h
libavfilter.v
vf_aspect.c
vf_blackframe.c
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_drawbox.c
vf_drawtext.c
vf_fade.c
vf_fieldorder.c
vf_fifo.c
vf_format.c
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_libopencv.c
vf_mp.c vf_mp: Fix large memleak. 2011-06-15 01:36:12 +02:00
vf_null.c
vf_overlay.c
vf_pad.c vsrc_color: add @file doxy 2011-06-18 02:09:07 +02:00
vf_pixdesctest.c
vf_scale.c
vf_select.c
vf_setpts.c
vf_settb.c
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c
vsink_nullsink.c
vsrc_buffer.c
vsrc_buffer.h
vsrc_color.c vsrc_color: set output pos values to -1 2011-06-18 02:09:07 +02:00
vsrc_movie.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
vsrc_nullsrc.c
yadif.h