generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b97b4b58a6
ffmpeg/libavcodec/bfin
History
Michael Niedermayer b97b4b58a6 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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 04:03:17 +02:00
..
config_bfin.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_bfin.c Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. 2011-04-10 22:33:42 +02:00
dsputil_bfin.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fdct_bfin.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
idct_bfin.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile Simplify arch-specific object file lists 2010-03-16 21:23:03 +00:00
mathops.h Merge remote branch 'qatar/master' 2011-05-10 04:03:17 +02:00
mpegvideo_bfin.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixels_bfin.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp3_bfin.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp3_idct_bfin.S Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00