diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 16:55:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 16:55:46 +0100 |
| commit | 4998a72b497fd4b658887aebb3a2240aefe1fc81 (patch) | |
| tree | 66518825972a9eb6227ab2da22878933e32fb148 /libavcodec/h264_mp4toannexb_bsf.c | |
| parent | b7f0d39d2629f0a1854adbda74c434a0754e9fa1 (diff) | |
| parent | efc7290eb668ce77ef28d0ab9958024d0a35fbe8 (diff) | |
| download | ffmpeg-streaming-4998a72b497fd4b658887aebb3a2240aefe1fc81.zip ffmpeg-streaming-4998a72b497fd4b658887aebb3a2240aefe1fc81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
Conflicts:
libavcodec/x86/rnd_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mp4toannexb_bsf.c')
0 files changed, 0 insertions, 0 deletions
