CrystalHD: Port to ref-counted frame API.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

opt: re-enable memleak fix for duplicated options.

The memleak fix in a1bcc76e was causing problems when the original
string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only
OPT_STRING occurence where it needed to be fixed is in ffserver. This
commit fixes that specific problem and so re-enable the original code.

vp56: remove unused variable

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

dsputil: remove hpel functions (moved to hpeldsp).

Move alpha half-pel assembly from dsputil to hpeldsp.

Move sparc/vis half-pel assembly from dsputil to hpeldsp.

Move sh4 half-pel assembly from dsputil to hpeldsp.

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

Move bfin half-pel assembly from dsputil to hpeldsp.

Move arm half-pel assembly from dsputil to hpeldsp.

Move ppc half-pel assembly from dsputil to hpeldsp.

Move x86 half-pel assembly from dsputil to hpeldsp.

mjpeg: use hpeldsp instead of dsputil for half-pel functions.

svq1enc: use hpeldsp instead of dsputil for half-pel functions.

snow: use hpeldsp instead of dsputil for half-pel functions.

svq3: use hpeldsp instead of dsputil for half-pel functions.

mpegvideo: use hpeldsp instead of dsputil for half-pel functions.

This also converts vc1, since that is mpegvideo-based.

svq1: use hpeldsp instead of dsputil for half-pel functions.

This makes svq1 independent of dsputil.

mimic: use hpeldsp instead of dsputil for half-pel functions.

interplayvideo: use hpeldsp instead of dsputil for half-pel functions.

This makes interplayvideo independent of dsputil.

bink: use hpeldsp instead of dsputil for half-pel functions.

indeo3: use hpeldsp instead of dsputil for half-pel functions.

This makes indeo3 independent of dsputil.

vp56: use hpeldsp instead of dsputil for half-pel functions.

This makes vp5 and vp6 independent of dsputil.

vp3: use hpeldsp instead of dsputil for half-pel functions.

This makes vp3 independent of dsputil.

hpeldsp: add half-pel functions (currently copies of dsputil).

Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'

* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h

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

Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'

* commit '0517c9e098092709397cc522c59fa63c83cc81be':
  lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft

Conflicts:
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/resample.c
libavcodec/resample2.c
libavcodec/version.h

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

Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'

* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
  atomic: prefer gcc builtins over win32 atomics, if available.
  avframe: copy reordered_opaque in copy_props

Conflicts:
libavutil/frame.c

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

Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05'

* commit '684e3d2e1ce96625eeef63f2564aab66f6715d05':
  ra144: check buffer size before requesting a buffer
  wmapro: unref skipped frames

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

Merge commit 'e3232f34312f8187094c875445683277ed0c209d'

* commit 'e3232f34312f8187094c875445683277ed0c209d':
  svq1: use av_frame_free to free refcounted frame
  lavc: fix get_buffer() compatibility layer for audio.

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

Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'

* commit '98cec5c84feff34e04428de4a86836a83657ae5e':
  ratecontrol: remove an unused variable
  vorbisdec: do not leak the first frame.
  vf_pad: fix a & instead of && typo

Conflicts:
libavfilter/vf_pad.c

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

avpacket: do not copy data when buf ref is available.

This at least fixes issues with lavf/subtitles. The behaviour of
av_dup_packet() is unchanged, only av_copy_packet() is affected.

Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
  avplay: enable only when SDL 1.2 is found

Conflicts:
configure

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

Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452'

* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
  lavc: remove disabled FF_API_VDA_ASYNC cruft

Conflicts:
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/version.h

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

avcodec: assert that old codec ids match new

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

Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'

* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
  lavc: remove disabled FF_API_CODEC_ID cruft

Conflicts:
libavcodec/old_codec_ids.h
libavcodec/version.h

Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.

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

lavfi/fieldorder: add support to named options

lavfi/fieldorder: remove unused headers and commented define

lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options

ffprobe: support codec options

Make ffprobe honour codec options, and support stream specifiers like it
is done in ffplay.

In particular, address Trac ticket #1859.

cmdutils: improve feedback in case of not found option

configure: remove selection of ff(a)buffersink.

buffersink is enabled unconditionally.

lavfi/buffersink: schedule removing the "ff" variants.

They are no longer needed since there is no incompatible
ABI version.

Remove references to the "ff" variant of buffersink.

lavfi/buffersink: rename filter structures.

Reduce the diff with the fork.

Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'

* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
  lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft

Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h

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

vp3/x86: use full transpose for all IDCTs.

This way, the special IDCT permutations are no longer needed. Bfin code
is disabled until someone updates it. This is similar to how H264 does
it, and removes the dsputil dependency imposed by the scantable code.

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

Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'

* commit '845017105f240ac5348aad1f8a5256b86d49db76':
  lavc: remove disabled FF_API_DSP_MASK cruft
  lavc: remove disabled FF_API_SUB_ID cruft

Conflicts:
libavcodec/options_table.h
libavcodec/version.h

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

Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'

* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
  lavc: remove disabled FF_API_INTER_THRESHOLD cruft
  lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
  lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft

Conflicts:
libavcodec/version.h

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

Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'

* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
  lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
  lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
  lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft

Conflicts:
libavcodec/flacenc.c
libavcodec/libgsm.c
libavcodec/utils.c
libavcodec/version.h

The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.

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

vp6: remove unused variable

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

Changelog: fix project name

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

Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'

* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
  atomic: fix CAS with armcc.
  png: use av_mallocz_array() for the zlib zalloc function
  libmp3lame: use the correct remaining buffer size when flushing

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

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30':
  atomic: Exclude the unsupported implementation headers from checkheaders
  avconv: do not silently ignore unused codec AVOptions.

Conflicts:
ffmpeg_opt.c

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

avfilter: remove unused variable

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

Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'

* commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460':
  avconv: fix a typo
  FATE: replace -vb with -b:v

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

Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'

* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
  FATE: remove the -dct option from some decoding tests.
  avconv: use a local variable for InputFile in open_input_file().

Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak

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

Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'

* commit '1da54e908eba73eb86f5d614c51f06811c85c3ea':
  avconv: use a local variable for OutputFile in open_output_file().

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

vorbis: unref the skipped first frame.

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

avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well

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

dsputil: make selectable.

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

ffmpeg: remove unused variable

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

h264: show recovery SEIs in debug output

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

j2kdec: remove unused variable and empty function

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

jv: initialize AVFrame

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

ffmpeg: fix reinit_filter type

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

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h

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

pthread: fix unused variable warning

lavd/v4l2: fix bug in init_convert_timestamp()

The current code returned a period=0, resulting in identical pts for all frames
after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and
not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.

Merge commit '2240e92f052960693de55cf4924e80426dfaa965'

* commit '2240e92f052960693de55cf4924e80426dfaa965':
  atomic: Add include guards to the implementation headers
  lavc: update the fallback versions of ff_thread_*

Conflicts:
libavcodec/utils.c

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

Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'

* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f':
  libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  wmaprodec: return an error, not 0, when the input is too small.

Conflicts:
libavcodec/vmdav.c

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

lavf: add AV_ to two remaining CODEC_ID_*.

Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'

* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
  wmaprodec: require block_align to be set.
  wmadec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset

Conflicts:
libavcodec/ivi_common.c

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

xface: remove unused stuff, fix related warnings

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

Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  xxan: fix invalid memory access in xan_decode_frame_type0()
  tty: set avg_frame_rate.
  FATE: enable multiple slices in the ffv1 vsynth test

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

Merge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'

* commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9':
  ffv1: fix calculating slice dimensions for version 2

Conflicts:
libavcodec/ffv1dec.c

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

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
libavcodec/h264.c

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

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h

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

avformat: keep r_frame_rate

This field is used and nothing equivalent exists

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

avformat/avdevice: add missing time.h includes

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

avcodec: postpone removial of parts still used

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

Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'

* commit '8df23e938b4022d6e6e9e1180ea6418abae74fda':
  lavc: postpone the removal of request_channels API.
  AVFrame: deprecate all now unused fields

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

Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'

* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.

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

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

* commit '354468fc12dcf93e7fb4af552e18906771913273':
  avplay: switch to new refcounted frames API
  avconv: convert to new refcounted AVFrame API

Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c

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

Merge commit '37045e422903695e610cca6ecb753df643ab9380'

* commit '37045e422903695e610cca6ecb753df643ab9380':
  mpegvideo: drop vismv code

Conflicts:
libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped

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

utils: Dont sent fake channel layouts, 0 layout is better when its not known

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

Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
libavcodec/utils.c

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

Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'

* commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d':
  lavc: limit maximum number of channels to 63

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

Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'

* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
  lavc: allow decoders to override frame parameters.

Conflicts:
libavcodec/utils.c

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

mss1: set frame defaults

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

buffer: use the atomic get instead of the add and fetch variant.

get_video_buffer: add vertical padding

Fix memory corruption

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

avcodec: fix motion vector vissualization

was broken by the buffer ref stuff

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

h264/mpegvideo: fix ff_print_debug_info2 arguments

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

mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is

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

atomic: prefer gcc builtins over win32 atomics, if available.

The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.

Signed-off-by: Martin Storsjö <martin@martin.st>

atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize

Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.

Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.

Signed-off-by: Martin Storsjö <martin@martin.st>

snow: set frame defaults

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

Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'

* commit '3b199d29cd597a3518136d78860e172060b9e83d':
  lavc decoders: properly initialize AVFrame.

Conflicts:
libavcodec/avs.c
libavcodec/c93.c
libavcodec/cinepak.c
libavcodec/flashsv.c
libavcodec/flicvideo.c
libavcodec/iff.c
libavcodec/mmvideo.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/qtrle.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c

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

h264: disallow single unpaired fields as references of frames

Fixes deadlock

lavfi/moviesrc: use refcounted frames