diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:16:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:16:27 +0100 |
| commit | 33dfddf65324dcb28114ea6907071605c2c3857b (patch) | |
| tree | d237faab18c4cf2356e22f29f814bc3e53834182 /libavdevice/pulse_audio_common.h | |
| parent | 1dab49c344409e6a5a0bf86ad0d0488bc192f933 (diff) | |
| parent | 3d1d175367f1f22e0c4952299a258272e2e2acf1 (diff) | |
| download | ffmpeg-33dfddf65324dcb28114ea6907071605c2c3857b.tar.gz | |
Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'
* commit '3d1d175367f1f22e0c4952299a258272e2e2acf1':
mpeg12enc: set frame packing information when relevant metadata is found
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_common.h')
0 files changed, 0 insertions, 0 deletions