diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:00:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:00:08 +0200 |
| commit | cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca (patch) | |
| tree | eab53df81a61f27ee2474366d01cb88233557ba0 /libavcodec/pictordec.c | |
| parent | d7f917c37af24eec2720231db03ab41469550855 (diff) | |
| parent | a42e3a6700547e4e49445bda81d3a89ec3e081a9 (diff) | |
| download | ffmpeg-cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca.tar.gz | |
Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
pcm_dvd: consolidate pieces from pcm.c and mpeg.c
Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pictordec.c')
0 files changed, 0 insertions, 0 deletions