diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:31:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:31:28 +0100 |
| commit | dc226c023d2b55d9e94b6b0b07b7c76ad6f0b16a (patch) | |
| tree | 2baeda6ba5ec200676ff341042daff87dd673f11 /libavcodec/alpha/Makefile | |
| parent | 329a3286d648414b672a983427e5c7d38589f7f9 (diff) | |
| parent | 7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 (diff) | |
| download | ffmpeg-dc226c023d2b55d9e94b6b0b07b7c76ad6f0b16a.tar.gz | |
Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'
* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
mpegvideo: remove h264-only fields
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha/Makefile')
0 files changed, 0 insertions, 0 deletions