1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 9891004ba9 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

Marged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-13 02:49:22 +02:00
..
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-13 02:49:22 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-10 03:32:29 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-13 02:49:22 +02:00
2011-04-13 02:49:22 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-13 02:49:22 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-07 03:32:26 +02:00
2011-04-09 03:17:07 +02:00
2011-04-07 03:32:26 +02:00
2011-04-03 16:40:12 +02:00
2011-04-08 02:50:13 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-08 02:50:13 +02:00
2011-04-09 03:17:07 +02:00
2011-04-08 02:50:13 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-06 01:09:04 +02:00
2011-04-04 02:15:12 +02:00
2011-04-08 02:50:13 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-11 04:08:08 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-05 02:31:56 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-07 03:32:26 +02:00
2011-04-05 02:31:56 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-08 02:50:13 +02:00
2011-04-05 02:31:56 +02:00
2011-04-09 03:17:07 +02:00
2011-04-08 02:50:13 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-09 03:17:07 +02:00
2011-04-13 02:49:22 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00