Michael Niedermayer
b043d80be4
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pcm_bluray: cosmetics
Conflicts:
libavcodec/pcm-bluray.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-31 13:47:04 +02:00
Michael Niedermayer
4273236e2f
Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'
...
* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-31 13:36:01 +02:00
Christian Schmidt
21fd2f84ce
pcm_bluray: cosmetics
2013-08-31 11:00:46 +02:00
Christian Schmidt
0d6549d8b5
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
...
The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.
2013-08-31 11:00:46 +02:00
