Merge remote branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat Apr 2 01:51:44 2011 +0200| [4defa68fe25eae4d7c27341e3b35811c047dcd3f] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
ac3enc: ARM optimised ac3_compute_matissa_size
ac3: armv6 optimised bit_alloc_calc_bap
fate: simplify fft test rules
avio: document avio_alloc_context.
lavf: make compute_chapters_end less picky.
sierravmd: fix Indeo3 videos
FFT: simplify fft8()
fate: add fixed-point fft/mdct tests
Fixed-point support in fft-test
ape: check that number of seektable entries is equal to number of frames

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4defa68fe25eae4d7c27341e3b35811c047dcd3f

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun Apr 3 02:28:01 2011 +0200| [f35439699f5546774b840ae9fba7df82729ef0ff] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
libavcodec/h264.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f35439699f5546774b840ae9fba7df82729ef0ff

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon Apr 4 02:15:12 2011 +0200| [2cae9809e2d59c7336fc2cccb97b82c7f764868a] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cae9809e2d59c7336fc2cccb97b82c7f764868a

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue Apr 5 02:24:55 2011 +0200| [434f248723d4d3e22545c3542ef9fc7c00b2379b] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (22 commits)
ac3enc: move extract_exponents inner loop to ac3dsp
avio: deprecate url_get_filename().
avio: deprecate url_max_packet_size().
avio: make url_get_file_handle() internal.
avio: make url_filesize() internal.
avio: make url_close() internal.
avio: make url_seek() internal.
avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
avio: make url_write() internal.
avio: make url_read_complete() internal.
avio: make url_read() internal.
avio: make url_open() internal.
avio: make url_connect internal.
avio: make url_alloc internal.
applehttp: Merge two for loops
applehttp: Restructure the demuxer to use a custom AVIOContext
applehttp: Move finished and target_duration to the variant struct
aacenc: reduce the number of loop index variables
avio: deprecate url_open_protocol
avio: deprecate url_poll and URLPollEntry
...

Conflicts:
libavformat/applehttp.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=434f248723d4d3e22545c3542ef9fc7c00b2379b

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed Apr 6 02:59:49 2011 +0200| [11d78415ca1beaa39303c280d7896024edc45aa7] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
psymodel: extend API to include PE and bit allocation.
avio: always compile dyn_buf functions
Remove unnecessary parameter from ff_thread_init() and fix behavior
Revert "aac_latm_dec: use aac context and aac m4ac"
configure: tell user if libva is enabled like the rest of external libs.
Add silence support for AV_SAMPLE_FMT_U8.
avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
avio: deprecate av_url_read_seek
avio: deprecate av_url_read_pause
ac3enc: NEON optimised extract_exponents

Conflicts:
libavcodec/utils.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d78415ca1beaa39303c280d7896024edc45aa7

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu Apr 7 03:32:26 2011 +0200| [c0e51ec9c625ccd7b3a8c74754145e6c023a3848] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Fix parser: mark av_parser_parse() for removal on next major bump
swscale: postpone sws_getContext removal until next major bump.
fate: add AAC LATM test
mmst: get rid of deprecated AVERRORs
lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
libavformat/utils.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0e51ec9c625ccd7b3a8c74754145e6c023a3848

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Fri Apr 8 02:50:13 2011 +0200| [c88caa522c41cd4108d39d8dd98805e867606ae3] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
proto: include os_support.h in network.h
matroskaenc: don't write an empty Cues element.
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
avio: move extern url_interrupt_cb declaration from avio.h to url.h
avio: make av_register_protocol2 internal.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
proto: introduce listen option in tcp
doc: clarify configure features
proto: factor ff_network_wait_fd and use it on udp

Conflicts:
ffmpeg.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c88caa522c41cd4108d39d8dd98805e867606ae3

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat Apr 9 03:09:49 2011 +0200| [d4d09329eef30787da699c7a397b00f6f96940bc] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4d09329eef30787da699c7a397b00f6f96940bc

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun Apr 10 03:31:53 2011 +0200| [a2beabc231f0d0c509e5c8f09fdab0ccb46eca10] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
daud: Don't write packets that are too large to have their size expressed in the bytestream.
DUPLICATE pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE Use consistent condition for whether to run slice-threading execute function.
avformat.h: fix a misplaced #endif
DUPLCIATE vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
DUPLICATE vaapi: filter out DELAYED_PIC_REF flag to determine field.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2beabc231f0d0c509e5c8f09fdab0ccb46eca10

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon Apr 11 04:02:45 2011 +0200| [ab8cfd45f8dcff5a9d60271b30dc4437756d5985] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
avio: add more documentation for AVIOContext.
Parse sprite data for WMVP and WVP2, and decode sprites for the latter
Replace outdated info on the FAQ
Redefine sameq
pad: fix example explanation
gradfun: add notice from the MPlayer manual
eval: add support for trunc, ceil, and floor functions
documentation: add setdar and setsar description to filters.texi
avio: document some members of AVIOContext.
avio: document avio_close().
avio: cosmetics, vertically align comments.
avio: cosmetics, group the reading functions.
avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
avio: cosmetics, move AVIOContext to start of the file.
avio: update file header.
os: fix OpenBSD/PowerPC compilation
pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
oggdec: fix demuxing chained audio streams
fix typo

Conflicts:
doc/filters.texi
libavformat/avio.h
libavutil/pixfmt.h

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab8cfd45f8dcff5a9d60271b30dc4437756d5985

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue Apr 12 03:43:43 2011 +0200| [4727ec3c0e64b9144006abf82e080fb734ad4b0a] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
Fix compilation of timefilter test program.
Add support for AMR-WB encoding via libvo-amrwbenc
Add an AAC encoder by using the libvo-aacenc library
g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
Changelog

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4727ec3c0e64b9144006abf82e080fb734ad4b0a

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed Apr 13 02:49:22 2011 +0200| [9891004ba91a126f56cd02c6f7a7b0c368a158b9] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
Error out if vaapi is not found
avio: undeprecate av_url_read_fseek/fpause under nicer names
libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
configure
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/flvdec.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9891004ba91a126f56cd02c6f7a7b0c368a158b9

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu Apr 14 03:21:38 2011 +0200| [c55780dcef1ba87564d8003cded7d045dce9ba34] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (32 commits)
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
libvo-*: Fix up the long codec names
libavcodec: Mark AVCodec->priv_class const
swscale: Factorize FAST_BGR2YV12 definition.
libvo-aacenc: Only produce extradata if the global header flag is set
lavf: postpone removal of public metadata conversion API
lavc: postpone removal of request_channels
lavc: postpone removal of audioconvert and sample_fmt wrappers
lavf: postpone removal of deprecated avio functions
libopencore-amr: Cosmetics: Rewrap and align
libopencore-amr, libvo-amrbwenc: Rename variables and functions
libopencore-amr: Convert commented out debug logging into av_dlog
libopencore-amr: Remove an unused state variable
libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
libopencore-amr: Remove a useless local variable
libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
libopencore-amr: Don't print carriage returns in log messages
...

Conflicts:
doc/developer.texi
libavcodec/avcodec.h
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c55780dcef1ba87564d8003cded7d045dce9ba34

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun Apr 17 23:36:57 2011 +0200| [c40798441f47341c310b38e8f329cfb943924faf] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket

Politic commits that have not been pulled:
Update regtest checksums after revision 6001dad.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c40798441f47341c310b38e8f329cfb943924faf

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed Apr 20 04:48:23 2011 +0200| [efb5fa79f5ca34140db357a00c999286097ab53e] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (37 commits)
In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
lavc: remove reference to opt.h from Makefile.
prefer avio_check() over url_exist()
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
lavu: remove misc disabled cruft
lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft
lavc: remove misc disabled cruft.
lavc: remove the FF_API_INOFFICIAL cruft.
lavc: remove the FF_API_SET_STRING_OLD cruft.
lavc: remove the FF_API_USE_LPC cruft.
lavc: remove the FF_API_SUBTITLE_OLD cruft.
lavc: remove the FF_API_VIDEO_OLD cruft.
lavc: remove the FF_API_AUDIO_OLD cruft.
lavc: remove the FF_API_OPT_SHOW cruft.
lavc: remove the FF_API_MM_FLAGS cruft.
lavf: remove misc disabled cruft.
lavf: remove FF_API_INDEX_BUILT cruft
lavf: remove FF_API_URL_CLASS cruft.
lavf: remove FF_API_SYMVER cruft
...

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efb5fa79f5ca34140db357a00c999286097ab53e

---

[Stefano Sabatini]

Post by Michael Niedermayer
Merge remote branch 'qatar/master'
* qatar/master: (37 commits)
In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
lavc: remove reference to opt.h from Makefile.
prefer avio_check() over url_exist()
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
lavu: remove misc disabled cruft
lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft

Why wasn't this pulled? (I suppose this depends on mp using the old
deprecated symbols).

Post by Michael Niedermayer
lavc: remove misc disabled cruft.
lavc: remove the FF_API_INOFFICIAL cruft.
lavc: remove the FF_API_SET_STRING_OLD cruft.
lavc: remove the FF_API_USE_LPC cruft.
lavc: remove the FF_API_SUBTITLE_OLD cruft.
lavc: remove the FF_API_VIDEO_OLD cruft.
lavc: remove the FF_API_AUDIO_OLD cruft.
lavc: remove the FF_API_OPT_SHOW cruft.
lavc: remove the FF_API_MM_FLAGS cruft.
lavf: remove misc disabled cruft.
lavf: remove FF_API_INDEX_BUILT cruft
lavf: remove FF_API_URL_CLASS cruft.
lavf: remove FF_API_SYMVER cruft
...

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efb5fa79f5ca34140db357a00c999286097ab53e

There is a reason for which old error code symbols have not been
removed?

BTW, would be possible to attach the merge patch here?

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu Apr 21 03:23:46 2011 +0200| [10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Makefile: Include dependencies for test tools, too
Remove a version check in av_log made unnecessary by the big bump.
update last major version increase dates in APIchanges
Reduce picture size for yadif.
oggdec: use av_freep() instead of av_free()
avio: Fix sanity checks in ffurl_read*
libavformat: Free AVFormatContext->streams
libavformat: Make protocols pass URLContext as log context where available
asf: remove commented out code in asf_read_seek
not pulled: libpostproc: Remove crufty code disabled by the big bump.
Reflect 0.7_beta1 release in the Changelog
not pulled: sws: remove disabled cruft.
lavu: remove disabled ff_random_get_seed cruft.
lavu: remove disabled sha1 cruft.

Conflicts:
Changelog
libavutil/sha1.h

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Fri Apr 22 03:50:23 2011 +0200| [8772156be0725fd20d948a855616fe155fafdc09] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Introduce slice threads flag.
FATE: allow forcing thread-type when doing threaded fate runs.
Use av_log_ask_for_sample() where appropriate.
error: sort, pack, and align error code and string definitions
The stabilization period after version bumps should be one month, not one week.
applehttp: Expose the stream bitrate via metadata
doc: Add some initial docs on the applehttp demuxer
Provide a fallback version of the libm function trunc
libavdevice: Define _XOPEN_SOURCE for usleep
lavc: provide deprecated avcodec_thread_init until next major version
lavc: provide the opt.h header until the next bump
error: change AVERROR_EOF value
error: remove AVERROR_NUMEXPECTED
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8772156be0725fd20d948a855616fe155fafdc09

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat Apr 23 01:09:43 2011 +0200| [e16665bf72d226b2c87c76a677414b8ef7720d7e] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics

Conflicts:
libavcodec/utils.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e16665bf72d226b2c87c76a677414b8ef7720d7e

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun Apr 24 03:38:03 2011 +0200| [7b376b398a464a5825ede8b10d5f605c526c7399] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
ffplay.c
ffprobe.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b376b398a464a5825ede8b10d5f605c526c7399

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon Apr 25 02:29:09 2011 +0200| [989fb05fe344d9666db858e0577c44969625184e] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
applehttp: Don't export variant_bitrate if it isn't known
crypto: Use av_freep instead of av_free
configure: Add missing libm library dependencies to .pc files.
oggdec: reindent after 8f3eebd6
configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
configure

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=989fb05fe344d9666db858e0577c44969625184e

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue Apr 26 04:12:43 2011 +0200| [3788a3c0c03585b0f8180a16d2a15b8e0e033313] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
graphparser: add a NULL check on the argument passed to strstr
setdar: prefer "sar" over "par" in log info message
fade: fix draw_slice() check on fade->factor value
fade: make draw_slice() chroma check against planes 1 and 2
win32: include the correct header in cmdutils.c
ac3: fix memleak in fixed-point encoder
flashsv: Return more meaningful error values.
flashsv: Employ explicit AVCodec struct initializers.
read AVI palette from the end of extradata
cosmetics: K&R coding style and more whitespace for Flash Screen Video

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3788a3c0c03585b0f8180a16d2a15b8e0e033313

---

[Michael Niedermayer]

ffmpeg | branch: oldabi | Michael Niedermayer <***@gmx.at> | Tue Apr 26 04:12:43 2011 +0200| [3788a3c0c03585b0f8180a16d2a15b8e0e033313] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
graphparser: add a NULL check on the argument passed to strstr
setdar: prefer "sar" over "par" in log info message
fade: fix draw_slice() check on fade->factor value
fade: make draw_slice() chroma check against planes 1 and 2
win32: include the correct header in cmdutils.c
ac3: fix memleak in fixed-point encoder
flashsv: Return more meaningful error values.
flashsv: Employ explicit AVCodec struct initializers.
read AVI palette from the end of extradata
cosmetics: K&R coding style and more whitespace for Flash Screen Video

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3788a3c0c03585b0f8180a16d2a15b8e0e033313

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed Apr 27 03:51:04 2011 +0200| [d7e5aebae7652ac766034f1d90e5a4f62677fb3c] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...

Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7e5aebae7652ac766034f1d90e5a4f62677fb3c

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu Apr 28 04:23:36 2011 +0200| [0665199e438fcdd2000717352fc665a8cf017f7c] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
vorbisdec: Rename silly "class_" variable to plain "class".
simple_idct_alpha: Drop some useless casts.
Simplify av_log_missing_feature().
ac3enc: remove check for mismatching channels and channel_layout
If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout.
If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother.
cosmetics: indentation
Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open().
aacdec: remove sf_scale and sf_offset.
aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec.
Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere.
Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway.
qpeg: use reget_buffer() in decode_frame()
ultimotion: use reget_buffer() in ulti_decode_frame()
smacker: remove unnecessary call to avctx->release_buffer in decode_frame()
avparser: don't av_malloc(0).

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0665199e438fcdd2000717352fc665a8cf017f7c

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Fri Apr 29 04:29:21 2011 +0200| [455ce979d0793096662d139e996107a527617832] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
LOTS of duplicates ...
avio: Fix the deprecated fallback URL-prefixed open flags
avoid duplicate -lm in .pc files
mpeg12: terminate mpeg2_video_profiles arrays
network: Check POLLERR and POLLHUP in ff_network_wait_fd
mpegtsenc: make PMT PID really start on pmt_start_pid
nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

Conflicts:
configure
libswscale/swscale.h
tests/ref/lavf/ts

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=455ce979d0793096662d139e996107a527617832

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat Apr 30 01:40:29 2011 +0200| [be315a3232d96a2704e276f1ebe870a4d249d090] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Duplicate AMV: disable DR1 and don't override EMU_EDGE
Duplicate lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
vorbis: Replace sized int_fast integer types with plain int/unsigned.
Remove disabled non-optimized code variants.
NO bswap.h: Remove disabled code.
Remove some disabled printf debug cruft.
Replace more disabled printf() calls by av_dlog().
NO tests: Remove disabled code.
NO Replace some commented-out debug printf() / av_log() messages with av_dlog().
vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
libavcodec/h264.c
libavcodec/vorbisdec.c
libavutil/log.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be315a3232d96a2704e276f1ebe870a4d249d090

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon May 2 03:37:36 2011 +0200| [c3f5b8112573245fc5056a49477749df4ed1d0ea] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
ALPHA: Replace sized int_fast integer types with plain int/unsigned.
Duplicate DPX image encoder
Duplicate DPX decoder: read sample aspect ratio
Duplciate DPX decoder: add buffer size checks.
ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
ac3enc: do not store a bandwidth code for each channel.
ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
ac3enc: differentiate between current block and reference block in bit_alloc()
ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
ac3enc: simplify stereo rematrixing decision options
Include both URLs: Update URL to fate samples

Conflicts:
Changelog
doc/fate.txt
libavcodec/ac3enc.c
libavcodec/dpxenc.c
libavcodec/version.h

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3f5b8112573245fc5056a49477749df4ed1d0ea

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue May 3 04:08:23 2011 +0200| [2525821f1aadf34e3c874c669feb6be27249e881] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
vp8: frame-multithreading.
Duplicate Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Duplicate Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Bug spoted&removed in last merge: dpx: Do not use DPX encoder for decoding.

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2525821f1aadf34e3c874c669feb6be27249e881

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed May 4 04:06:26 2011 +0200| [707e8612e85ba83fcbbfc56be3f4ab24af7e98fb] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream

Conflicts:
cmdutils.h

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=707e8612e85ba83fcbbfc56be3f4ab24af7e98fb

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu May 5 03:09:48 2011 +0200| [b000b86e1dd03c4ff89cd63a6fa88fc280947c94] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...

Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b000b86e1dd03c4ff89cd63a6fa88fc280947c94

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Fri May 6 04:28:12 2011 +0200| [6dc30b25c5513f6f02077825411377e167415d52] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
configure: warn if pkg-config is missing

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dc30b25c5513f6f02077825411377e167415d52

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat May 7 04:14:09 2011 +0200| [e5a85164b100620fe529bae0ce623956f0bab2e9] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
mov: fix composition timestamps on movie fragments.
wmavoice: Use proper size in memeset().

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5a85164b100620fe529bae0ce623956f0bab2e9

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun May 8 03:29:51 2011 +0200| [6d6b0c96fdc576f4643e3d4066e5ebebdb693ade] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
drawtext: add documentation for the shadow parameters
drawtext: add shadow support.
drawtext: factor draw_glyphs.
drawtext: fix and optimize yuv blend.
drawtext: get rid of divisions in the inner loop.
drawtext: simplify chroma blend and fix chroma alpha.
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

Conflicts:
configure
libavfilter/avfilter.h
libavfilter/vf_drawtext.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d6b0c96fdc576f4643e3d4066e5ebebdb693ade

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon May 9 04:27:07 2011 +0200| [6841c8c5791e857a3327411f23c13b0d28f69f1f] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6841c8c5791e857a3327411f23c13b0d28f69f1f

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue May 10 04:01:29 2011 +0200| [b97b4b58a6e1ac595002b3e3f3469161771c6003] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding

Conflicts:
ffmpeg.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b97b4b58a6e1ac595002b3e3f3469161771c6003

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Wed May 11 05:34:17 2011 +0200| [59eb12faff9505da49f54d499dd43404226e37f6] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (30 commits)
AVOptions: make default_val a union, as proposed in AVOption2.
arm/h264pred: add missing argument type.
h264dsp_mmx: place bracket outside #if/#endif block.
lavf/utils: fix ff_interleave_compare_dts corner case.
fate: add 10-bit H264 tests.
h264: do not print "too many references" warning for intra-only.
Enable decoding of high bit depth h264.
Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
Add support for higher QP values in h264.
Add the notion of pixel size in h264 related functions.
Make the h264 loop filter bit depth aware.
Template dsputil_template.c with respect to pixel size, etc.
Template h264idct_template.c with respect to pixel size, etc.
Preparatory patch for high bit depth h264 decoding support.
Move some functions in dsputil.c into a new file dsputil_template.c.
Move the functions in h264idct into a new file h264idct_template.c.
Move the functions in h264pred.c into a new file h264pred_template.c.
Preparatory patch for high bit depth h264 decoding support.
Add pixel formats for 9- and 10-bit yuv420p.
Choose h264 chroma dc dequant function dynamically.
...

Conflicts:
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_iwmmxt.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/bfin/dsputil_bfin.c
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264dsp.c
libavcodec/h264idct.c
libavcodec/h264pred.c
libavcodec/mlib/dsputil_mlib.c
libavcodec/options.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/h264_altivec.c
libavcodec/ps2/dsputil_mmi.c
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.c
libavcodec/sparc/dsputil_vis.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavformat/options.c
libavformat/utils.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_template.c
tests/ref/seek/lavf_avi

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59eb12faff9505da49f54d499dd43404226e37f6

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Thu May 12 04:51:24 2011 +0200| [612122b187d711257eecd517e4049cef3bb0b7f0] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (32 commits)
10-bit H.264 x86 chroma v loopfilter asm
Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
Fix crash of interlaced MPEG2 decoding
h264pred: fix one more aliasing violation.
doc/APIchanges: fill in missing hashes and dates.
flacenc: use proper initializers for AVOption default values.
lavc: deprecate named constants for deprecated antialias_algo.
aac: workaround for compilation on cygwin
swscale: extend YUV422p support to 10bits depth
tiff: add support for inverted FillOrder for uncompressed data
Remove unused softfloat implementation.
h264pred: fix aliasing violations.
rotozoom: Eliminate French variable name.
rotozoom: Check return value of fread().
rotozoom: Return an error value instead of calling exit().
rotozoom: Make init_demo() return int and check for errors on invocation.
rotozoom: Drop silly UINT8 typedef.
rotozoom: Drop some unnecessary parentheses.
rotozoom: K&R coding style cosmetics
rtsp: Only do keepalive using GET_PARAMETER if the server supports it
...

Conflicts:
Changelog
cmdutils.c
doc/APIchanges
doc/general.texi
ffmpeg.c
ffplay.c
libavcodec/h264pred_template.c
libavcodec/resample.c
libavutil/pixfmt.h
libavutil/softfloat.c
libavutil/softfloat.h
tests/rotozoom.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=612122b187d711257eecd517e4049cef3bb0b7f0

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Fri May 13 04:40:40 2011 +0200| [72153419b52c96b1ed4a1bfb7e7793ddde7d71b2] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master: (33 commits)
rtpdec_qdm2: Don't try to parse data packet if no configuration is received
ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
srtdec: make sure we don't write past the end of buffer
wmaenc: improve channel count and bitrate error handling in encode_init()
matroskaenc: make sure we don't produce invalid file with no codec ID
matroskadec: check that pointers were initialized before accessing them
lavf: fix function name in compute_pkt_fields2 av_dlog message
lavf: fix av_find_best_stream when providing a wanted stream.
lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
ffmpeg: factorize quality calculation
tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
tiff: Prefer enum TiffCompr over int for TiffContext.compr.
mov: Support edit list atom version 1.
configure: Enable libpostproc automatically if GPL code is enabled.
Cosmetics: fix prototypes in oggdec
oggdec: fix memleak with continuous streams.
matroskaenc: add missing new line in av_log() call
dnxhdenc: add AVClass in private context.
...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
configure
ffmpeg.c
libavformat/matroskaenc.c
libavutil/pixfmt.h
libswscale/ppc/swscale_template.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/utils.c
libswscale/x86/swscale_template.c
tests/fate/h264.mak
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_copy_le
tests/ref/lavfi/pixfmts_null_le
tests/ref/lavfi/pixfmts_scale_le
tests/ref/lavfi/pixfmts_vflip_le

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72153419b52c96b1ed4a1bfb7e7793ddde7d71b2

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sat May 14 02:19:23 2011 +0200| [58c03f6d7d6eabdbc25103e8229a06ddf3718bb9] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P.
Add av_clip_uintp2() function
(our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate) movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate) ffmpeg: use parse_number_and_die() when it makes sense
(No thanks) ffmpeg: get rid of the 'q' key schizofrenia

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58c03f6d7d6eabdbc25103e8229a06ddf3718bb9

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Sun May 15 04:40:50 2011 +0200| [5a153604c930792aa7f00c55cbf3c470f582dfb7] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
Fix FSF address copy paste error in some license headers.
Add an aac sample which uses LTP to fate-aac.
DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
arm: properly mark external symbol call

Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libswscale/ppc/swscale_template.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a153604c930792aa7f00c55cbf3c470f582dfb7

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Mon May 16 05:01:24 2011 +0200| [fc193793c625afc9af2b7d7d46248f78da7e3a2d] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
acelp: Remove unused gray_decode table.
dfa: Remove unused variable.
configure: Include AVX availability in summary output.
configure: use same CPPFLAGS in kFreeBSD as Linux

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc193793c625afc9af2b7d7d46248f78da7e3a2d

---

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <***@gmx.at> | Tue May 17 04:47:05 2011 +0200| [f8ae3a2108b612776e886d927b4a7289dde619f1] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
ffmpeg: fix -aspect cli option
Restructure video filter implementation in ffmpeg.c.
ffplay: remove audio_write_get_buf_size() forward declaration
lavfi: print key-frame and picture type information in ff_dlog_ref()
mathops: remove ancient confusing comment
cws2fws: Improve error message wording.
tools: Check the return value of write().
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
mpegaudio: remove OUT_MIN/MAX macros
Add missing #includes to mp3_header_(de)compress bsf
dct: fix indentation
dct: bypass table allocation for DCT_II of size 32
h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
Remove unused header mpegaudio3.h.

Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8ae3a2108b612776e886d927b4a7289dde619f1

---