diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-05 02:24:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-05 02:31:56 +0200 |
| commit | 434f248723d4d3e22545c3542ef9fc7c00b2379b (patch) | |
| tree | 4c399c1fa89215676e14f57c84a3244af806c39e /libavcodec/rawenc.c | |
| parent | 6114bffa91714c83a533ae7e5a597ee605d35c3d (diff) | |
| parent | 2310ee4b1cca48609d06774b7c3c70a5f38f3473 (diff) | |
| download | ffmpeg-434f248723d4d3e22545c3542ef9fc7c00b2379b.tar.gz | |
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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rawenc.c')
0 files changed, 0 insertions, 0 deletions